New ext syntax + removed dead helper

Author: pl752

src/FirebirdSql.Data.FirebirdClient/Common/Extensions.cs

@@ -72,22 +72,6 @@ public IEnumerable<IEnumerable<T>> Split(int size)
 		}
 	}
 
-	extension(string s)
-	{
-		public IEnumerable<char[]> EnumerateRunesToChars()
-		{
-			if (s == null)
-				throw new ArgumentNullException(nameof(s));
-
-			return s.EnumerateRunes().Select(r =>
-			{
-				var result = new char[r.Utf16SequenceLength];
-				r.EncodeToUtf16(result);
-				return result;
-			});
-		}
-	}
-
 	extension(Encoding)
 	{
 		public static Encoding GetANSIEncoding()
@@ -103,59 +87,62 @@ public static Encoding GetANSIEncoding()
 		}
 	}
 
-	public static int CountRunes(this ReadOnlySpan<char> text)
+	extension(ReadOnlySpan<char> text)
 	{
-		var length = text.Length;
-		if(length == 0)
-			return 0;
+		public int CountRunes()
+		{
+			var length = text.Length;
+			if(length == 0)
+				return 0;
 
-		var i = text.IndexOfAnyInRange('\uD800', '\uDBFF');
-		if(i < 0)
-			return length;
+			var i = text.IndexOfAnyInRange('\uD800', '\uDBFF');
+			if(i < 0)
+				return length;
 
-		var count = i;
-		while(i < length)
-		{
-			if(char.IsHighSurrogate(text[i]) && i + 1 < length && char.IsLowSurrogate(text[i + 1]))
+			var count = i;
+			while(i < length)
 			{
-				i += 2;
+				if(char.IsHighSurrogate(text[i]) && i + 1 < length && char.IsLowSurrogate(text[i + 1]))
+				{
+					i += 2;
+				}
+				else
+				{
+					i++;
+				}
+				count++;
 			}
-			else
-			{
-				i++;
-			}
-			count++;
+			return count;
 		}
-		return count;
-	}
 
-	public static ReadOnlySpan<char> TruncateStringToRuneCount(this ReadOnlySpan<char> text, int maxRuneCount)
-	{
-		if(maxRuneCount <= 0 || text.IsEmpty)
-			return ReadOnlySpan<char>.Empty;
+		public ReadOnlySpan<char> TruncateStringToRuneCount(int maxRuneCount)
+		{
+			if(maxRuneCount <= 0 || text.IsEmpty)
+				return ReadOnlySpan<char>.Empty;
 
-		var length = text.Length;
-		if(maxRuneCount >= length)
-			return text;
+			var length = text.Length;
+			if(maxRuneCount >= length)
+				return text;
 
-		var prefix = text[..maxRuneCount];
-		var i = prefix.IndexOfAnyInRange('\uD800', '\uDBFF');
-		if(i < 0)
-			return prefix;
+			var prefix = text[..maxRuneCount];
+			var i = prefix.IndexOfAnyInRange('\uD800', '\uDBFF');
+			if(i < 0)
+				return prefix;
 
-		var remaining = maxRuneCount - i;
-		while(i < length && remaining > 0)
-		{
-			if(char.IsHighSurrogate(text[i]) && i + 1 < length && char.IsLowSurrogate(text[i + 1]))
-			{
-				i += 2;
-			}
-			else
+			var remaining = maxRuneCount - i;
+			while(i < length && remaining > 0)
 			{
-				i++;
+				if(char.IsHighSurrogate(text[i]) && i + 1 < length && char.IsLowSurrogate(text[i + 1]))
+				{
+					i += 2;
+				}
+				else
+				{
+					i++;
+				}
+				remaining--;
 			}
-			remaining--;
+			return text[..i];
 		}
-		return text[..i];
 	}
 }