Fix issue where urls were parsed as offsets

Closes #45

Author: jeffijoe

src/Jeffijoe.MessageFormat.Tests/MessageFormatterCachingTests.cs

@@ -4,48 +4,17 @@
 // Author: Jeff Hansen <[email protected]>
 // Copyright (C) Jeff Hansen 2015. All rights reserved.
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 using Jeffijoe.MessageFormat.Formatting;
-using Jeffijoe.MessageFormat.Helpers;
 using Jeffijoe.MessageFormat.Tests.TestHelpers;
-
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Jeffijoe.MessageFormat.Tests
 {
     /// <summary>
     /// The message formatter_caching_tests.
     /// </summary>
-    public class MessageFormatterCachingTests
+    public class MessageFormatterCachingTests()
     {
-        #region Fields
-
-        /// <summary>
-        /// The output helper.
-        /// </summary>
-        private readonly ITestOutputHelper outputHelper;
-
-        #endregion
-
-        #region Constructors and Destructors
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MessageFormatterCachingTests"/> class.
-        /// </summary>
-        /// <param name="outputHelper">
-        /// The output helper.
-        /// </param>
-        public MessageFormatterCachingTests(ITestOutputHelper outputHelper)
-        {
-            this.outputHelper = outputHelper;
-        }
-
-        #endregion
-
         #region Public Methods and Operators
 
         /// <summary>
@@ -75,71 +44,7 @@ public void FormatMessage_caches_reused_pattern()
             Assert.Equal("Hi Ma'am!", actual);
             Assert.Equal(3, parser.ParseCount);
         }
-
-        /// <summary>
-        /// The format message_with_cache_benchmark.
-        /// </summary>
-        [Fact]
-        public void FormatMessage_with_cache_benchmark()
-        {
-            var subject = new MessageFormatter(useCache: true);
-            this.Benchmark(subject);
-        }
-
-        /// <summary>
-        /// The format message_without_cache_benchmark.
-        /// </summary>
-        [Fact]
-        public void FormatMessage_without_cache_benchmark()
-        {
-            var subject = new MessageFormatter(false);
-            this.Benchmark(subject);
-        }
-
-        #endregion
-
-        #region Methods
-
-        /// <summary>
-        /// The benchmark.
-        /// </summary>
-        /// <param name="subject">
-        /// The subject.
-        /// </param>
-        private void Benchmark(MessageFormatter subject)
-        {
-            var pattern = "\r\n----\r\nOh {name}? And if we were " + "to surround {gender, select, " + "male {his} "
-                          + "female {her}" + "} name with '{' and '}', it would look "
-                          + "like '{'{name}'}'? Yeah, I know {gender, select, " + "male {him} " + "female {her}"
-                          + "}. {gender, select, " + "male {He's}" + "female {She's}" + "} got {messageCount, plural, "
-                          + "zero {no messages}" + "one {just one message}" + "=42 {a universal amount of messages}"
-                          + "other {uuhm... let's see.. Oh yeah, # messages - and here's a pound: '#'}" + "}!";
-            int iterations = 100000;
-            var args = new Dictionary<string, object?>[iterations];
-            var rnd = new Random();
-            for (int i = 0; i < iterations; i++)
-            {
-                var val = rnd.Next(50);
-                args[i] =
-                    new
-                    {
-                        gender = val % 2 == 0 ? "male" : "female",
-                        name = val % 2 == 0 ? "Jeff" : "Marcela",
-                        messageCount = val
-                    }.ToDictionary();
-            }
-
-            TestHelpers.Benchmark.Start("Formatting message " + iterations + " times, no warm-up.", this.outputHelper);
-            var output = new StringBuilder();
-            for (int i = 0; i < iterations; i++)
-            {
-                output.AppendLine(subject.FormatMessage(pattern, args[i]));
-            }
-
-            TestHelpers.Benchmark.End(this.outputHelper);
-            this.outputHelper.WriteLine(output.ToString());
-        }
-
+        
         #endregion
     }
 }

src/Jeffijoe.MessageFormat/Formatting/BaseFormatter.cs

@@ -57,21 +57,22 @@ protected internal IEnumerable<FormatterExtension> ParseExtensions(FormatterRequ
                 return Enumerable.Empty<FormatterExtension>();
             }
 
-            int length = request.FormatterArguments.Length;
+            var length = request.FormatterArguments.Length;
             index = 0;
             const char Colon = ':';
-            bool foundExtension = false;
+            const char OpenBrace = '{';
+            var foundExtension = false;
 
             var extension = StringBuilderPool.Get();
             var value = StringBuilderPool.Get();
             try
             {
-                for (int i = 0; i < length; i++)
+                for (var i = 0; i < length; i++)
                 {
                     var c = request.FormatterArguments[i];
 
                     // Whitespace is tolerated at the beginning.
-                    bool isWhiteSpace = char.IsWhiteSpace(c);
+                    var isWhiteSpace = char.IsWhiteSpace(c);
                     if (isWhiteSpace)
                     {
                         // We've reached the end
@@ -106,6 +107,12 @@ protected internal IEnumerable<FormatterExtension> ParseExtensions(FormatterRequ
                         continue;
                     }
 
+                    if (c == OpenBrace)
+                    {
+                        // It's not an extension.
+                        break;
+                    }
+
                     extension.Append(c);
                 }
 

src/Jeffijoe.MessageFormat/Formatting/Formatters/SelectFormatter.cs

@@ -65,11 +65,11 @@ public string Format(string locale,
             object? value,
             IMessageFormatter messageFormatter)
         {
+            var str = Convert.ToString(value);
             var parsed = this.ParseArguments(request);
             KeyedBlock? other = null;
             foreach (var keyedBlock in parsed.KeyedBlocks)
             {
-                var str = Convert.ToString(value);
                 if (str == keyedBlock.Key)
                 {
                     return messageFormatter.FormatMessage(keyedBlock.BlockText, args);