Fixed crash when doing multiple enumerations on the result of the Codepoints method. Updated to version 0.6.2.

Author: FoolRunning

UnicodeHelper.Tests/DotNetStringExtensionsTests.cs

@@ -1,4 +1,6 @@
-namespace UnicodeHelper
+using System.Diagnostics.CodeAnalysis;
+
+namespace UnicodeHelper
 {
     [TestClass]
     public class DotNetStringExtensionsTests
@@ -17,6 +19,19 @@ public void Codepoints(string dotNetString)
         {
             Assert.That.SequenceEqual(new UString(dotNetString), dotNetString.Codepoints());
         }
+
+        [TestMethod]
+        [DynamicData(nameof(CodepointsTestData))]
+        [SuppressMessage("ReSharper", "PossibleMultipleEnumeration")]
+        public void Codepoints_MultipleIterations(string dotNetString)
+        {
+            UString expectedResult = new(dotNetString);
+            IEnumerable<UCodepoint> codepoints = dotNetString.Codepoints();
+
+            Assert.That.SequenceEqual(expectedResult, codepoints);
+            Assert.That.SequenceEqual(expectedResult, codepoints);
+            Assert.That.SequenceEqual(expectedResult, codepoints);
+        }
         #endregion
     }
 }

UnicodeHelper/DotNetStringExtensions.cs

@@ -22,7 +22,7 @@ public static IEnumerable<UCodepoint> Codepoints(this string dotNetString)
         #region DotNetStringEnumerator class
         private sealed class DotNetStringEnumerator : IEnumerator<UCodepoint>, IEnumerable<UCodepoint>
         {
-            private string _dotNetString;
+            private readonly string _dotNetString;
             private int _index = -1;
             private UCodepoint _current;
 
@@ -33,9 +33,7 @@ public DotNetStringEnumerator(string dotNetString)
 
             public void Dispose()
             {
-                if (_dotNetString != null)
-                    _index = _dotNetString.Length;
-                _dotNetString = null;
+                _index = _dotNetString.Length;
             }
 
             public UCodepoint Current
@@ -54,10 +52,7 @@ public UCodepoint Current
 
             public bool MoveNext()
             {
-                _index++;
-                if (_current > 0xFFFF)
-                    _index++;
-
+                _index += (_current <= 0xFFFF) ? 1 : 2;
                 if (_index >= _dotNetString.Length)
                     return false;
 
@@ -73,6 +68,7 @@ public void Reset()
 
             public IEnumerator<UCodepoint> GetEnumerator()
             {
+                Reset();
                 return this;
             }
 

UnicodeHelper/UnicodeHelper.csproj

@@ -7,7 +7,7 @@
     <RunAnalyzersDuringLiveAnalysis>False</RunAnalyzersDuringLiveAnalysis>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Title>Unicode Helper</Title>
-    <Version>0.6.1</Version>
+    <Version>0.6.2</Version>
     <Authors>FoolRunning</Authors>
     <Description>.Net library to get information about Unicode codepoints and to better handle the upper planes (1-16) of Unicode.</Description>
     <Copyright>© 2024 Tim Steenwyk</Copyright>