Cleanup

Author: andrewvk

CodeJam.Main/Arithmetic/OperatorsFactory.cs

@@ -387,6 +387,7 @@ private static Expression BuildNullableEnumComparisonCore<T>(
 		/// <returns>Callback for the compare operator</returns>
 		public static Func<T?, T?, bool> ComparisonOperator<T>(ExpressionType comparisonType)
 		{
+			// ReSharper disable once SwitchStatementHandlesSomeKnownEnumValuesWithDefault
 			switch (comparisonType)
 			{
 				case ExpressionType.Equal:

CodeJam.Main/Assertions/Code.cs

@@ -263,7 +263,7 @@ public static T ReturnIfNotNull<T>(
 			[InvokerParameterName] string argName)
 			where T : class
 		{
-			Code.NotNull(arg, argName);
+			NotNull(arg, argName);
 			return arg;
 		}
 		#endregion

CodeJam.Main/Assertions/CodeExceptionsHelper.cs

@@ -35,7 +35,7 @@ public static void BreakIfAttached()
 		[DebuggerHidden, MustUseReturnValue]
 		[StringFormatMethod("messageFormat")]
 		public static string InvariantFormat(string messageFormat, params object[]? args) =>
-			(args == null || args.Length == 0)
+			args == null || args.Length == 0
 				? messageFormat
 				: string.Format(CultureInfo.InvariantCulture, messageFormat, args);
 

CodeJam.Main/Collections/Enumerable/EnumerableExtensions.MinMaxOrDefault.cs

@@ -110,7 +110,7 @@ public static T MaxOrDefault(
 						var candidateIsNan = _hasNaN && areNotEqual(candidate, candidate);
 
 						// DONTTOUCH: !greaterThan used for result NaN handling
-						if (result == null || !candidateIsNan && !greaterThan(result, candidate))
+						if (result == null || (!candidateIsNan && !greaterThan(result, candidate)))
 						{
 							result = candidate;
 						}
@@ -146,7 +146,7 @@ public static T MaxOrDefault<TSource>(
 						var candidateIsNan = _hasNaN && areNotEqual(candidate, candidate);
 
 						// DONTTOUCH: !greaterThan used for result NaN handling
-						if (result == null || !candidateIsNan && !greaterThan(result, candidate))
+						if (result == null || (!candidateIsNan && !greaterThan(result, candidate)))
 						{
 							result = candidate;
 						}

CodeJam.Main/ConnectionStrings/ConnectionStringBase.cs

@@ -203,8 +203,9 @@ void ICollection<KeyValuePair<string, object>>.CopyTo(KeyValuePair<string, objec
 		/// <inheritdoc />
 		bool ICollection<KeyValuePair<string, object>>.Remove(KeyValuePair<string, object> item)
 		{
-			if (_wrapper.TryGetValue(item.Key, out var value) && Equals(item.Value, value))
-				return _wrapper.Remove(item.Key);
+			var (key, o) = item;
+			if (_wrapper.TryGetValue(key, out var value) && Equals(o, value))
+				return _wrapper.Remove(key);
 
 			return false;
 		}

CodeJam.Main/DisposableExtensions.cs

@@ -35,7 +35,6 @@ public static void DisposeAll([InstantHandle] this IEnumerable<IDisposable> disp
 			}
 
 			if (exceptions != null)
-				// ReSharper disable once UnthrowableException
 				throw new AggregateException(exceptions);
 		}
 

CodeJam.Main/Expressions/ExpressionExtensions.GetMembers.cs

@@ -133,22 +133,14 @@ public static MethodInfo GetMethod(this LambdaExpression expression)
 		{
 			var info = GetMemberInfo(expression);
 
-			if (info is PropertyInfo propertyInfo)
-			{
-				if (propertyInfo.GetGetMethod(true) is { } getMethodInfo)
+			return
+				info switch
 				{
-					return getMethodInfo;
-				}
-
-				throw CodeExceptions.Argument(nameof(expression), "Expression is not property get method.");
-			}
-
-			if (info is MethodInfo methodInfo)
-			{
-				return methodInfo;
-			}
-
-			throw CodeExceptions.Argument(nameof(expression), "Expression is not method call.");
+					PropertyInfo propertyInfo when propertyInfo.GetGetMethod(true) is { } getMethodInfo => getMethodInfo,
+					PropertyInfo => throw CodeExceptions.Argument(nameof(expression), "Expression is not property get method."),
+					MethodInfo methodInfo => methodInfo,
+					_ => throw CodeExceptions.Argument(nameof(expression), "Expression is not method call.")
+				};
 		}
 
 		/// <summary>

CodeJam.Main/Expressions/ExpressionExtensions.cs

@@ -184,6 +184,7 @@ private static void VisitInternal(this Expression? expr, [InstantHandle] Action<
 				{
 					void Action(MemberBinding b)
 					{
+						// ReSharper disable once SwitchStatementHandlesSomeKnownEnumValuesWithDefault
 						switch (b.BindingType)
 						{
 							case MemberBindingType.Assignment:
@@ -497,6 +498,7 @@ private static void VisitInternal(this Expression? expr, [InstantHandle] Func<Ex
 				{
 					bool Modify(MemberBinding b)
 					{
+						// ReSharper disable once SwitchStatementHandlesSomeKnownEnumValuesWithDefault
 						switch (b.BindingType)
 						{
 							case MemberBindingType.Assignment:
@@ -1072,6 +1074,7 @@ private static IEnumerable<T> TransformInternal<T>(
 					return ex;
 			}
 
+			// ReSharper disable once SwitchStatementHandlesSomeKnownEnumValuesWithDefault
 			switch (expr.NodeType)
 			{
 				case ExpressionType.Add:
@@ -1204,6 +1207,7 @@ private static IEnumerable<T> TransformInternal<T>(
 				{
 					MemberBinding Modify(MemberBinding b)
 					{
+						// ReSharper disable once SwitchStatementHandlesSomeKnownEnumValuesWithDefault
 						switch (b.BindingType)
 						{
 							case MemberBindingType.Assignment:

CodeJam.Main/Ranges/[Ranges]/Range`2.NonGenerated.cs

@@ -116,7 +116,7 @@ public override int GetHashCode() =>
 		[Pure, System.Diagnostics.Contracts.Pure]
 		public override string ToString() =>
 			KeyPrefixString + _key + KeySeparatorString +
-				(IsEmpty ? EmptyString : (_from + SeparatorString + _to));
+				(IsEmpty ? EmptyString : _from + SeparatorString + _to);
 
 		/// <summary>
 		/// Returns string representation of the range using the specified format string.

CodeJam.Main/Reflection/ReflectionExtensions.MetadataAttributes.cs

@@ -176,7 +176,7 @@ private static IEnumerable<TAttribute> GetAttributesForTypeSingleLevel<TAttribut
 			this Type type)
 			where TAttribute : class
 		{
-			var inheritanceTypes = Sequence.CreateWhileNotNull(type, t => t?.GetBaseType())
+			var inheritanceTypes = Sequence.CreateWhileNotNull(type, t => t.GetBaseType())
 				.ToArray();
 
 			// ReSharper disable once CoVariantArrayConversion
@@ -192,7 +192,7 @@ private static IEnumerable<TAttribute> GetAttributesForTypeWithNesting<TAttribut
 			where TAttribute : class
 		{
 			var visited = new HashSet<Type>(_typeComparer);
-			var typesToCheck = Sequence.CreateWhileNotNull(type, t => t?.DeclaringType);
+			var typesToCheck = Sequence.CreateWhileNotNull(type, t => t.DeclaringType);
 			foreach (var typeToCheck in typesToCheck)
 			{
 #pragma warning disable IDE0007 // use 'var' instead of explicit type
@@ -298,7 +298,7 @@ private static MemberInfo[] GetOverrideChainCore<TMember>(
 			var result = new List<MemberInfo>();
 			var implMethod = accessorGetter(member);
 			var baseDefinition = implMethod.GetBaseDefinition();
-			var typesToCheck = Sequence.CreateWhileNotNull(implMethod.DeclaringType, t => t?.GetBaseType());
+			var typesToCheck = Sequence.CreateWhileNotNull(implMethod.DeclaringType, t => t.GetBaseType());
 			foreach (var type in typesToCheck)
 			{
 				foreach (var candidate in membersGetter(type))