Fix CommonRegexes.String not matching single character strings (#427)

* Fix CommonRegexes.String not matching single character strings * Bump version
ParadoxGameConverters · Apr 21, 2024 · 0d0eba4 · 0d0eba4
1 parent ea9e947
commit 0d0eba4
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/commonItems.UnitTests/CommonRegexesTests.cs b/commonItems.UnitTests/CommonRegexesTests.cs
@@ -187,6 +187,12 @@ public void StringRegexDoesntMatchEquals() {
 		Assert.DoesNotMatch(CommonRegexes.String, "1234-abcd=");
 	}
 
+	[Fact]
+	public void StringRegexMatchesSingleCharacters() {
+		Assert.Matches(CommonRegexes.String, "a");
+		Assert.Matches(CommonRegexes.String, "1");
+	}
+
 	[Fact]
 	public void QuotedStringRegexMatchesQuotedStrings() {
 		Assert.Matches(CommonRegexes.QuotedString, @"""1234-abcd""");

diff --git a/commonItems.UnitTests/ParserHelperTests.cs b/commonItems.UnitTests/ParserHelperTests.cs
@@ -235,6 +235,18 @@ public void GetStringsAddsStringsFromBracedBlock() {
 		Assert.Equal(["foo", "bar", "baz"], reader.GetStrings());
 	}
 
+	[Fact]
+	public void GetStringsAddsSingleCharacterStrings() {
+		var reader = new BufferedReader("a b c x y z");
+		Assert.Equal(["a", "b", "c", "x", "y", "z"], reader.GetStrings());
+	}
+
+	[Fact]
+	public void GetStringGetsSingleCharacterString() {
+		var reader = new BufferedReader(" = f");
+		Assert.Equal("f", reader.GetString());
+	}
+
 	[Fact]
 	public void GetStringGetsStringAfterEquals() {
 		var reader = new BufferedReader(" = foo");

diff --git a/commonItems/CommonRegexes.cs b/commonItems/CommonRegexes.cs
@@ -19,8 +19,8 @@ public static partial class CommonRegexes {
 	public static Regex QuotedFloat => GetQuotedFloatRegex();
 
 	// strings
-	public static Regex String => new($"^(?!@).+[^{NonStringCharacters}]+$");
-	public static Regex QuotedString => new(@"^""[^\n\""]+""$");
+	public static Regex String => new($"^(?!@).*[^{NonStringCharacters}]+$");
+	public static Regex QuotedString => GetQuotedStringRegex();
 
 	// dates
 	public static Regex Date => GetDateRegex();
@@ -40,4 +40,6 @@ public static partial class CommonRegexes {
 	private static partial Regex GetQuotedFloatRegex();
 	[GeneratedRegex("^\\-?\\d+[.]\\d+[.]\\d+$")]
 	private static partial Regex GetDateRegex();
+	[GeneratedRegex(@"^""[^\n\""]+""$")]
+	private static partial Regex GetQuotedStringRegex();
 }
diff --git a/commonItems/commonItems.csproj b/commonItems/commonItems.csproj
@@ -6,7 +6,7 @@
 
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <PackageId>PGCG.$(AssemblyName)</PackageId>
-    <Version>12.0.1</Version>
+    <Version>12.0.2</Version>
     <Authors>PGCG</Authors>
     <PackageProjectUrl>https://github.com/ParadoxGameConverters/commonItems.NET</PackageProjectUrl>
     <RepositoryUrl>https://github.com/ParadoxGameConverters/commonItems.NET</RepositoryUrl>