Merge branch 'main' of github.com:YarnSpinnerTool/YarnSpinner into feature/custom-line-ids

Author: desplesda

CHANGELOG.md

@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 
 - Fixed a bug where unbalanced markup without text siblings or children would cause an error
+- Fixed a bug where numbers inside markup properties were being parsed in a culture variant manner.
 
 ### Removed
 

Tests/TestCases/Commands.testplan

@@ -22,5 +22,6 @@ command: `show 1`
 command: `0`
 command: `2 {0}`
 command: `regular old command`
+command: `zorp 2.1`
 
 stop

Tests/TestCases/Commands.yarn

@@ -66,4 +66,6 @@ title: Start
 // another weird but allowed situation
 <<set $replacement = "ular old co">>
 <<reg{$replacement}mmand>>
+
+<<zorp {2.1}>>
 ===

YarnSpinner.Tests/MarkupTests.cs

@@ -1230,6 +1230,70 @@ public void TestMarkupMultiplePropertyParsing()
 
         }
 
+        [Theory]
+        [InlineData("[p=1,1 /]")]
+        [InlineData("[p=-1,1 /]")]
+        public void TestMarkupPropertyParsingUsesInvariantNumberParsingFails(string input)
+        {
+            var targetCultures = new[] {
+                "en",
+                "zh-Hans",
+                "ru",
+                "es-US",
+                "es",
+                "sw",
+                "ar",
+                "pt-BR",
+                "de",
+                "fr",
+                "fr-FR",
+                "ja",
+                "pl",
+                "ko",
+            };
+
+            foreach (var culture in targetCultures)
+            {    
+                System.Globalization.CultureInfo.CurrentCulture = new System.Globalization.CultureInfo(culture);
+                var lineParser = new LineParser();
+                var markup = lineParser.ParseStringWithDiagnostics(input, culture);
+                markup.diagnostics.Should().ContainSingle();
+            }
+        }
+
+        [Theory]
+        [InlineData("[p=1.1 /]", 1.1)]
+        [InlineData("[p=-1.1 /]",-1.1)]
+        public void TestMarkupPropertyParsingUsesInvariantNumber(string input, float propertyValue)
+        {
+            var targetCultures = new[] {
+                "en",
+                "zh-Hans",
+                "ru",
+                "es-US",
+                "es",
+                "sw",
+                "ar",
+                "pt-BR",
+                "de",
+                "fr",
+                "fr-FR",
+                "ja",
+                "pl",
+                "ko",
+            };
+
+            foreach (var culture in targetCultures)
+            {    
+                System.Globalization.CultureInfo.CurrentCulture = new System.Globalization.CultureInfo(culture);
+                var lineParser = new LineParser();
+                var markup = lineParser.ParseStringWithDiagnostics(input, culture);
+                markup.diagnostics.Should().BeEmpty();
+                markup.markup.Attributes[0].Properties["p"].FloatValue.Should().Be(propertyValue);
+            }
+        }
+
+
         [Theory]
         [InlineData(@"[a p=""string""]s[/a]", MarkupValueType.String, "string")]
         [InlineData(@"[a p=""str\""ing""]s[/a]", MarkupValueType.String, @"str""ing")]
@@ -1253,6 +1317,8 @@ public void TestMarkupPropertyParsing(string input, MarkupValueType expectedType
             var lineParser = new LineParser();
             var markup = lineParser.ParseString(input, "en");
 
+            markup.Attributes.Should().ContainSingle();
+
             var attribute = markup.Attributes[0];
             var propertyValue = attribute.Properties["p"];
 

YarnSpinner/VirtualMachine.cs

@@ -567,7 +567,6 @@ internal void RunInstruction(Instruction i)
                         // passes it to the client as a line
                         string stringKey = i.RunLine.LineID;
 
-
                         var expressionCount = i.RunLine.SubstitutionCount;
 
                         var strings = new string[expressionCount];

YarnSpinner/YarnSpinner.Markup/LineParser.cs

@@ -517,9 +517,8 @@ internal List<LexerToken> LexMarkup(string input)
                             // now here we have gobbled every contiguous digit/period
                             // so can finish up the token and return to tag mode
                             // but before we do that we want to do a quick check to see if its actually a valid float
-
 #pragma warning disable CA1846 // Prefer 'AsSpan' over 'Substring' (not available in .NET Standard 2.0)
-                            if (float.TryParse(input.Substring(token.Start, currentPosition + 1 - token.Start), out _))
+                            if (float.TryParse(input.Substring(token.Start, currentPosition + 1 - token.Start), System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.InvariantCulture, out _))
 #pragma warning restore CA1846 // Prefer 'AsSpan' over 'Substring'
                             {
                                 token.End = currentPosition;
@@ -960,7 +959,8 @@ bool TryIntFromToken(LexerToken token, out int value)
             {
                 var valueString = OG.Substring(token.Start, token.Range);
 
-                if (int.TryParse(valueString, out value))
+
+                if (int.TryParse(valueString, System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out value))
                 {
                     return true;
                 }
@@ -972,7 +972,7 @@ bool TryFloatFromToken(LexerToken token, out float value)
             {
                 var valueString = OG.Substring(token.Start, token.Range);
 
-                if (float.TryParse(valueString, out value))
+                if (float.TryParse(valueString, System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.InvariantCulture, out value))
                 {
                     return true;
                 }