@@ -210,19 +210,19 @@ public int FindBestMethodBasedOnArguments(IEnumerable<MethodBase> methods, ref E
210
210
211
211
public int FindIndexer ( Type type , Expression [ ] args , out MethodBase ? method )
212
212
{
213
- foreach ( Type t in SelfAndBaseTypes ( type ) )
213
+ foreach ( var t in SelfAndBaseTypes ( type ) )
214
214
{
215
- MemberInfo [ ] members = t . GetDefaultMembers ( ) ;
215
+ var members = t . GetDefaultMembers ( ) ;
216
216
if ( members . Length != 0 )
217
217
{
218
218
IEnumerable < MethodBase > methods = members . OfType < PropertyInfo > ( ) .
219
219
#if ! ( NETFX_CORE || WINDOWS_APP || UAP10_0 || NETSTANDARD )
220
- Select ( p => ( MethodBase ) p . GetGetMethod ( ) ) .
221
- Where ( m => m != null ) ;
220
+ Select ( p => ( MethodBase ? ) p . GetGetMethod ( ) ) .
221
+ OfType < MethodBase > ( ) ;
222
222
#else
223
223
Select ( p => ( MethodBase ) p . GetMethod ) ;
224
224
#endif
225
- int count = FindBestMethodBasedOnArguments ( methods , ref args , out method ) ;
225
+ var count = FindBestMethodBasedOnArguments ( methods , ref args , out method ) ;
226
226
if ( count != 0 )
227
227
{
228
228
return count ;
@@ -289,7 +289,7 @@ private bool IsApplicable(MethodData method, Expression[] args)
289
289
if ( methodParameter . IsOut && args [ i ] is ParameterExpression parameterExpression )
290
290
{
291
291
#if NET35
292
- return false ;
292
+ return false ;
293
293
#else
294
294
if ( ! parameterExpression . IsByRef )
295
295
{
@@ -318,33 +318,31 @@ private bool IsApplicable(MethodData method, Expression[] args)
318
318
319
319
private static bool FirstIsBetterThanSecond ( Expression [ ] args , MethodData first , MethodData second )
320
320
{
321
- // If args count is 0 -> parameterless method is better than method method with parameters
321
+ // If args count is 0 -> parameterless method is better than a method with parameters
322
322
if ( args . Length == 0 )
323
323
{
324
324
return first . Parameters . Length == 0 && second . Parameters . Length != 0 ;
325
325
}
326
326
327
- bool better = false ;
328
- for ( int i = 0 ; i < args . Length ; i ++ )
327
+ var better = false ;
328
+ for ( var i = 0 ; i < args . Length ; i ++ )
329
329
{
330
- CompareConversionType result = CompareConversions ( args [ i ] . Type , first . Parameters [ i ] . ParameterType , second . Parameters [ i ] . ParameterType ) ;
331
-
332
- // If second is better, return false
333
- if ( result == CompareConversionType . Second )
334
- {
335
- return false ;
336
- }
337
-
338
- // If first is better, return true
339
- if ( result == CompareConversionType . First )
340
- {
341
- return true ;
342
- }
330
+ var result = CompareConversions ( args [ i ] . Type , first . Parameters [ i ] . ParameterType , second . Parameters [ i ] . ParameterType ) ;
343
331
344
- // If both are same, just set better to true and continue
345
- if ( result == CompareConversionType . Both )
332
+ switch ( result )
346
333
{
347
- better = true ;
334
+ // If second is better, return false
335
+ case CompareConversionType . Second :
336
+ return false ;
337
+
338
+ // If first is better, return true
339
+ case CompareConversionType . First :
340
+ return true ;
341
+
342
+ // If both are same, just set better to true and continue
343
+ case CompareConversionType . Both :
344
+ better = true ;
345
+ break ;
348
346
}
349
347
}
350
348
@@ -369,8 +367,8 @@ private static CompareConversionType CompareConversions(Type source, Type first,
369
367
return CompareConversionType . Second ;
370
368
}
371
369
372
- bool firstIsCompatibleWithSecond = TypeHelper . IsCompatibleWith ( first , second ) ;
373
- bool secondIsCompatibleWithFirst = TypeHelper . IsCompatibleWith ( second , first ) ;
370
+ var firstIsCompatibleWithSecond = TypeHelper . IsCompatibleWith ( first , second ) ;
371
+ var secondIsCompatibleWithFirst = TypeHelper . IsCompatibleWith ( second , first ) ;
374
372
375
373
if ( firstIsCompatibleWithSecond && ! secondIsCompatibleWithFirst )
376
374
{
0 commit comments