Style only changes.

Author: electricessence

.editorconfig

@@ -72,8 +72,8 @@ dotnet_style_allow_statement_immediately_after_block_experimental = false
 #### C# Coding Conventions ####
 
 # var preferences
-csharp_style_var_elsewhere = false
-csharp_style_var_for_built_in_types = false
+csharp_style_var_elsewhere = false:silent
+csharp_style_var_for_built_in_types = false:silent
 csharp_style_var_when_type_is_apparent = true:suggestion
 
 # Expression-bodied members
@@ -97,7 +97,7 @@ csharp_style_prefer_switch_expression = true:suggestion
 csharp_style_conditional_delegate_call = true:warning
 
 # Modifier preferences
-csharp_prefer_static_local_function = true
+csharp_prefer_static_local_function = true:suggestion
 csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
 
 # Code-block preferences
@@ -115,16 +115,16 @@ csharp_style_prefer_index_operator = true:silent
 csharp_style_prefer_null_check_over_type_check = true:warning
 csharp_style_prefer_range_operator = true:silent
 csharp_style_throw_expression = true:warning
-csharp_style_unused_value_assignment_preference = discard_variable:suggestion
+csharp_style_unused_value_assignment_preference = discard_variable:silent
 csharp_style_unused_value_expression_statement_preference = discard_variable:silent
 
 # 'using' directive preferences
 csharp_using_directive_placement = outside_namespace:warning
 
 # New line preferences
 csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = false:warning
-csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true
-csharp_style_allow_embedded_statements_on_same_line_experimental = true
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true:silent
+csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent
 
 #### C# Formatting Rules ####
 
@@ -225,6 +225,12 @@ dotnet_diagnostic.SYSLIB1045.severity = silent
 
 # IDE0055: Fix formatting
 dotnet_diagnostic.IDE0055.severity = silent
+csharp_prefer_system_threading_lock = true:suggestion
+csharp_prefer_static_anonymous_function = true:warning
+csharp_style_prefer_readonly_struct = true:error
+csharp_style_prefer_readonly_struct_member = true:suggestion
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = false:error
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = false:error
 
 [*.{cs,vb}]
 dotnet_style_operator_placement_when_wrapping = beginning_of_line
@@ -252,4 +258,22 @@ dotnet_style_prefer_simplified_interpolation = true:suggestion
 dotnet_style_namespace_match_folder = true:suggestion
 dotnet_diagnostic.CA1510.severity = silent
 dotnet_diagnostic.CA1512.severity = silent
-dotnet_diagnostic.CA1863.severity = none
+dotnet_diagnostic.CA1863.severity = none
+dotnet_diagnostic.IDE0056.severity = silent
+dotnet_diagnostic.IDE0057.severity = silent
+dotnet_diagnostic.IDE0058.severity = silent
+dotnet_style_prefer_collection_expression = when_types_loosely_match:suggestion
+dotnet_style_readonly_field = true:suggestion
+dotnet_style_predefined_type_for_locals_parameters_members = true:warning
+dotnet_style_predefined_type_for_member_access = true:warning
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+dotnet_style_allow_multiple_blank_lines_experimental = true:silent
+dotnet_style_allow_statement_immediately_after_block_experimental = false:silent
+dotnet_code_quality_unused_parameters = all:suggestion
+dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:suggestion
+dotnet_style_parentheses_in_other_binary_operators = never_if_unnecessary:suggestion
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:suggestion
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:suggestion
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_event = false:suggestion

Source/EnumValue.cs

@@ -60,10 +60,11 @@ public static IReadOnlyList<TEnum> Values
 	internal static ConcurrentDictionary<TEnum, IReadOnlyList<Attribute>> Attributes
 		=> LazyInitializer.EnsureInitialized(ref _attributes)!;
 
-	static Func<TEnum, string> GetEnumNameDelegate()
+	private static Func<TEnum, string> GetEnumNameDelegate()
 	{
-		var tResult = typeof(string);
-		var eValue = Parameter(typeof(TEnum), "value"); // (TEnum value)
+		Type tResult = typeof(string);
+		ParameterExpression eValue
+			= Parameter(typeof(TEnum), "value"); // (TEnum value)
 
 		return Lambda<Func<TEnum, string>>(
 			Switch(tResult, eValue,
@@ -85,12 +86,12 @@ internal static Func<TEnum, string> NameLookup
 			GetEnumNameDelegate)!;
 	internal static Func<string, ValueLookupResult> GetEnumTryParseDelegate()
 	{
-		var valueParam = Parameter(typeof(string), "value");
-		var lengthParam = Variable(typeof(int), "length");
-		var defaultExpression = CreateNewTuple(false, default!);
-		var enumValues = Values.Select(v => (value: v, name: string.Intern(v.ToString())));
-		var nameGroups = enumValues.GroupBy(v => v.name.Length).OrderBy(g => g.Key);
-		var lengthCheckCases = nameGroups.Select(group =>
+		ParameterExpression valueParam = Parameter(typeof(string), "value");
+		ParameterExpression lengthParam = Variable(typeof(int), "length");
+		Expression defaultExpression = CreateNewTuple(false, default!);
+		IEnumerable<(TEnum value, string name)> enumValues = Values.Select(v => (value: v, name: string.Intern(v.ToString())));
+		IOrderedEnumerable<IGrouping<int, (TEnum value, string name)>> nameGroups = enumValues.GroupBy(v => v.name.Length).OrderBy(g => g.Key);
+		SwitchCase[] lengthCheckCases = nameGroups.Select(group =>
 			SwitchCase(
 				Switch(
 					valueParam,
@@ -150,31 +151,32 @@ internal static IReadOnlyDictionary<string, TEnum> IgnoreCaseLookup
 			{
 				// If the enum has duplicate values, we want to use the first one.
 				var result = new Dictionary<string, TEnum>(StringComparer.OrdinalIgnoreCase);
-				foreach (var e in Values)
+				foreach (TEnum e in Values)
 				{
-					var v = Enum.GetName(typeof(TEnum), e)!;
+					string v = Enum.GetName(typeof(TEnum), e)!;
 					if (result.ContainsKey(v)) continue;
 					result[v] = e;
 				}
+
 				return result;
 			})!;
 
-	static Entry[]?[] CreateLookup()
+	private static Entry[]?[] CreateLookup()
 	{
-		var longest = 0;
+		int longest = 0;
 		var d = new Dictionary<int, List<Entry>>();
 
-		foreach (var e in Values)
+		foreach (TEnum e in Values)
 		{
-			var n = string.Intern(e.ToString());
-			var len = n.Length;
+			string n = string.Intern(e.ToString());
+			int len = n.Length;
 			if (len > longest) longest = len;
-			if (!d.TryGetValue(len, out var v)) d.Add(len, v = []);
+			if (!d.TryGetValue(len, out List<Entry>? v)) d.Add(len, v = []);
 			v.Add(new(n, e));
 		}
 
 		var result = new Entry[]?[longest + 1];
-		foreach (var i in d.Keys)
+		foreach (int i in d.Keys)
 			result[i] = [.. d[i].OrderBy(v => v.Name)];
 
 		return result;
@@ -194,10 +196,10 @@ public Entry(string name, TEnum value)
 		public static int Find(Span<Entry> span, ReadOnlySpan<char> name, StringComparison sc)
 		{
 			// Small enough? Just brute force the index.
-			var len = span.Length;
+			int len = span.Length;
 			if (len < 12)
 			{
-				for (var i = 0; i < len; i++)
+				for (int i = 0; i < len; i++)
 				{
 					ref Entry e = ref span[i];
 					if (name.Equals(e.Name, sc))
@@ -214,12 +216,12 @@ public static int Find(Span<Entry> span, ReadOnlySpan<char> name, StringComparis
 			while (left <= right)
 			{
 				int middle = left + (right - left) / 2;
-				var middleKey = span[middle].Name.AsSpan();
+				ReadOnlySpan<char> middleKey = span[middle].Name.AsSpan();
 
 				if (right - left < 4 && name.Equals(middleKey, sc))
 					return middle;
 
-				var comparison = name.CompareTo(middleKey, sc);
+				int comparison = name.CompareTo(middleKey, sc);
 				if (comparison < 0)
 					right = middle - 1;
 				else if (comparison > 0)
@@ -326,7 +328,7 @@ public override bool Equals(object? obj)
 	/// </summary>
 	public static implicit operator EnumValue<TEnum>(string value) => new(value);
 
-	static class Underlying<T>
+	private static class Underlying<T>
 		where T : notnull
 	{
 		public static readonly Dictionary<T, TEnum> Map = [];
@@ -336,7 +338,7 @@ static Underlying()
 		{
 			if (typeof(T) != UnderlyingType) return;
 
-			foreach (var e in Values)
+			foreach (TEnum e in Values)
 			{
 				var i = (T)System.Convert.ChangeType(e, typeof(T));
 				Map.Add(i, e);
@@ -361,7 +363,7 @@ public static bool TryGetValue<T>(T value, out TEnum e)
 
 	private string GetDebuggerDisplay()
 	{
-		var eType = typeof(TEnum);
+		Type eType = typeof(TEnum);
 		return $"{eType.Name}.{Value} [EnumValue<{eType.FullName}>]";
 	}
 }
@@ -481,7 +483,7 @@ public static implicit operator EnumValueCaseIgnored<TEnum>(string value)
 
 	private string GetDebuggerDisplay()
 	{
-		var eType = typeof(TEnum);
+		Type eType = typeof(TEnum);
 		return $"{eType.Name}.{ToString()} [EnumValueCaseIgnored<{eType.FullName}>]";
 	}
 }
@@ -501,7 +503,7 @@ public static class EnumValue
 	public static TEnum Parse<TEnum>(string value)
 		where TEnum : notnull, Enum
 	{
-		var (success, result) = EnumValue<TEnum>.ValueLookup(value);
+		(bool success, TEnum result) = EnumValue<TEnum>.ValueLookup(value);
 		return success ? result
 			: throw new ArgumentException(string.Format(NotFoundMessage, value), nameof(value));
 	}
@@ -511,7 +513,7 @@ public static TEnum Parse<TEnum>(string value)
 	public static bool TryParse<TEnum>(string value, out TEnum e)
 		where TEnum : notnull, Enum
 	{
-		var result = EnumValue<TEnum>.ValueLookup(value);
+		EnumValue<TEnum>.ValueLookupResult result = EnumValue<TEnum>.ValueLookup(value);
 		e = result.Value;
 		return result.Success;
 	}
@@ -523,15 +525,15 @@ public static bool TryParse<TEnum>(string value, out TEnum e)
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	public static TEnum Parse<TEnum>(StringSegment value)
 		where TEnum : notnull, Enum
-		=> TryParse<TEnum>(value, false, out var e) ? e
+		=> TryParse<TEnum>(value, false, out TEnum? e) ? e
 		: throw new ArgumentException(string.Format(NotFoundMessage, value), nameof(value));
 
 	/// <inheritdoc cref="TryParse{TEnum}(StringSegment, bool, out TEnum)"/>
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	public static TEnum Parse<TEnum>(string value, bool ignoreCase)
 		where TEnum : notnull, Enum
 		=> ignoreCase
-			? EnumValue<TEnum>.IgnoreCaseLookup.TryGetValue(value, out var e) ? e
+			? EnumValue<TEnum>.IgnoreCaseLookup.TryGetValue(value, out TEnum? e) ? e
 				: throw new ArgumentException(string.Format(NotFoundMessage, value), nameof(value))
 			: Parse<TEnum>(value);
 
@@ -540,10 +542,10 @@ public static TEnum Parse<TEnum>(string value, bool ignoreCase)
 	public static TEnum Parse<TEnum>(StringSegment value, bool ignoreCase)
 		where TEnum : notnull, Enum
 	{
-		var buffer = value.Buffer ?? throw new ArgumentNullException(nameof(value));
+		string buffer = value.Buffer ?? throw new ArgumentNullException(nameof(value));
 		return value.Length == buffer.Length
 			? Parse<TEnum>(value.Buffer, ignoreCase)
-			: TryParse<TEnum>(value, ignoreCase, out var e)
+			: TryParse<TEnum>(value, ignoreCase, out TEnum? e)
 			? e : throw new ArgumentException(string.Format(NotFoundMessage, value), nameof(value));
 	}
 
@@ -578,27 +580,27 @@ public static bool TryParseIgnoreCase<TEnum>(string name, out TEnum e)
 	public static bool TryParse<TEnum>(StringSegment name, bool ignoreCase, out TEnum e)
 		where TEnum : notnull, Enum
 	{
-		var len = name.Length;
+		int len = name.Length;
 		if (len == 0) goto notFound;
 
 		// If this is a string, use the optimized version.
 		string buffer = name.Buffer!;
 		if (buffer.Length == len)
 			return TryParse(buffer, ignoreCase, out e);
 
-		var lookup = EnumValue<TEnum>.Lookup;
+		EnumValue<TEnum>.Entry[]?[] lookup = EnumValue<TEnum>.Lookup;
 		if (len >= lookup.Length) goto notFound;
 
-		var r = lookup[len];
+		EnumValue<TEnum>.Entry[]? r = lookup[len];
 		if (r is null) goto notFound;
 		Debug.Assert(r.Length != 0);
 
-		var sc = ignoreCase
+		StringComparison sc = ignoreCase
 			? StringComparison.OrdinalIgnoreCase
 			: StringComparison.Ordinal;
 
-		var span = r.AsSpan();
-		var index = EnumValue<TEnum>.Entry.Find(span, name, sc);
+		Span<EnumValue<TEnum>.Entry> span = r.AsSpan();
+		int index = EnumValue<TEnum>.Entry.Find(span, name, sc);
 		if (index != -1)
 		{
 			e = span[index].Value;
@@ -641,8 +643,8 @@ public static IReadOnlyList<Attribute> GetAttributes<TEnum>(this TEnum value)
 
 		static IReadOnlyList<Attribute> GetAttributesCore(TEnum value)
 		{
-			var memInfo = typeof(TEnum).GetMember(value.GetName());
-			var attributes = memInfo[0].GetCustomAttributes(false);
+			MemberInfo[] memInfo = typeof(TEnum).GetMember(value.GetName());
+			object[] attributes = memInfo[0].GetCustomAttributes(false);
 			return attributes.Length is 0
 				? Array.Empty<Attribute>()
 				: Array.AsReadOnly(attributes.OfType<Attribute>().ToArray());

Source/Extensions.Equals.cs

@@ -12,7 +12,7 @@ public static partial class TextExtensions
 	public static bool Equals(this ReadOnlySpan<char> source, StringSegment other, StringComparison comparisonType)
 	{
 		if (!other.HasValue) return false;
-		var len = source.Length;
+		int len = source.Length;
 		return len == other.Length && len switch
 		{
 			0 => true,
@@ -25,7 +25,7 @@ public static bool Equals(this ReadOnlySpan<char> source, StringSegment other, S
 	public static bool Equals(this Span<char> source, StringSegment other, StringComparison comparisonType)
 	{
 		if (!other.HasValue) return false;
-		var len = source.Length;
+		int len = source.Length;
 		return len == other.Length && len switch
 		{
 			0 => true,
@@ -37,7 +37,7 @@ public static bool Equals(this Span<char> source, StringSegment other, StringCom
 	/// <inheritdoc cref="Equals(ReadOnlySpan{char}, StringSegment, StringComparison)"/>
 	public static bool Equals(this Span<char> source, ReadOnlySpan<char> other, StringComparison comparisonType)
 	{
-		var len = source.Length;
+		int len = source.Length;
 		return len == other.Length && len switch
 		{
 			0 => true,
@@ -50,7 +50,7 @@ public static bool Equals(this Span<char> source, ReadOnlySpan<char> other, Stri
 	public static bool Equals(this string? source, ReadOnlySpan<char> other, StringComparison comparisonType)
 	{
 		if (source is null) return false;
-		var len = source.Length;
+		int len = source.Length;
 		return len == other.Length && len switch
 		{
 			0 => true,
@@ -63,7 +63,7 @@ public static bool Equals(this string? source, ReadOnlySpan<char> other, StringC
 	public static bool Equals(this StringSegment source, ReadOnlySpan<char> other, StringComparison comparisonType)
 	{
 		if (!source.HasValue) return false;
-		var len = source.Length;
+		int len = source.Length;
 		return len == other.Length && len switch
 		{
 			0 => true,
@@ -136,12 +136,12 @@ public static bool TrimmedEquals(this string? source, ReadOnlySpan<char> other,
 	/// <inheritdoc cref="TrimmedEquals(string?, StringSegment, ReadOnlySpan{char}, StringComparison)"/>
 	public static bool TrimmedEquals(this string? source, StringSegment other, char trimChar, StringComparison comparisonType = StringComparison.Ordinal)
 	{
-		var otherHasValue = !other.HasValue;
+		bool otherHasValue = !other.HasValue;
 		if (source is null) return otherHasValue;
 		if (otherHasValue) return false;
 		int slen = source.Length, olen = other.Length;
 		if (slen < olen) return false;
-		var span = source.AsSpan().Trim(trimChar);
+		ReadOnlySpan<char> span = source.AsSpan().Trim(trimChar);
 		slen = span.Length;
 		return slen == olen && slen switch
 		{
@@ -193,7 +193,7 @@ public static bool TrimmedEquals(this string? source, StringSegment other, ReadO
 		if (!other.HasValue) return false;
 		int slen = source.Length, olen = other.Length;
 		if (slen < olen) return false;
-		var trimmed = source.AsSpan().Trim(trimChars);
+		ReadOnlySpan<char> trimmed = source.AsSpan().Trim(trimChars);
 		slen = trimmed.Length;
 		return slen == olen && slen switch
 		{