Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Using nameof when looking up members through reflection #358

Merged
merged 1 commit into from
Apr 13, 2017
Merged

Using nameof when looking up members through reflection #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions Rx.NET/Source/src/System.Reactive/Joins/QueryablePattern.cs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Rx.NET/Source/src/System.Reactive/Linq/Observable/FromEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ protected override TDelegate GetHandler(Action<TEventArgs> onNext)

if (_conversion == null)
{
handler = ReflectionUtils.CreateDelegate<TDelegate>(onNext, typeof(Action<TEventArgs>).GetMethod("Invoke"));
handler = ReflectionUtils.CreateDelegate<TDelegate>(onNext, typeof(Action<TEventArgs>).GetMethod(nameof(Action<TEventArgs>.Invoke)));
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions Rx.NET/Source/src/System.Reactive/Linq/Observable/FromEventPattern.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ protected override TDelegate GetHandler(Action<EventPattern<TEventArgs>> onNext)
if (_conversion == null)
{
Action<object, TEventArgs> h = (sender, eventArgs) => onNext(new EventPattern<TEventArgs>(sender, eventArgs));
handler = ReflectionUtils.CreateDelegate<TDelegate>(h, typeof(Action<object, TEventArgs>).GetMethod("Invoke"));
handler = ReflectionUtils.CreateDelegate<TDelegate>(h, typeof(Action<object, TEventArgs>).GetMethod(nameof(Action<object, TEventArgs>.Invoke)));
}
else
{
Expand All @@ -61,7 +61,7 @@ public Impl(Action<TDelegate> addHandler, Action<TDelegate> removeHandler, ISche
protected override TDelegate GetHandler(Action<EventPattern<TSender, TEventArgs>> onNext)
{
Action<TSender, TEventArgs> h = (sender, eventArgs) => onNext(new EventPattern<TSender, TEventArgs>(sender, eventArgs));
return ReflectionUtils.CreateDelegate<TDelegate>(h, typeof(Action<TSender, TEventArgs>).GetMethod("Invoke"));
return ReflectionUtils.CreateDelegate<TDelegate>(h, typeof(Action<TSender, TEventArgs>).GetMethod(nameof(Action<TSender, TEventArgs>.Invoke)));
}
}

Expand Down Expand Up @@ -94,7 +94,7 @@ public Handler(object target, Type delegateType, MethodInfo addMethod, MethodInf
protected override Delegate GetHandler(Action<TResult> onNext)
{
Action<TSender, TEventArgs> h = (sender, eventArgs) => onNext(_getResult(sender, eventArgs));
return ReflectionUtils.CreateDelegate(_delegateType, h, typeof(Action<TSender, TEventArgs>).GetMethod("Invoke"));
return ReflectionUtils.CreateDelegate(_delegateType, h, typeof(Action<TSender, TEventArgs>).GetMethod(nameof(Action<TSender, TEventArgs>.Invoke)));
}

protected override IDisposable AddHandler(Delegate handler)
Expand Down
10 changes: 5 additions & 5 deletions Rx.NET/Source/src/System.Reactive/Linq/QueryLanguage.Events.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ private static IObservable<EventPattern<TEventArgs>> FromEventPattern_<TDelegate
var res = new AnonymousObservable<EventPattern<TEventArgs>>(observer =>
{
Action<object, TEventArgs> handler = (sender, eventArgs) => observer.OnNext(new EventPattern<TEventArgs>(sender, eventArgs));
var d = ReflectionUtils.CreateDelegate<TDelegate>(handler, typeof(Action<object, TEventArgs>).GetMethod("Invoke"));
var d = ReflectionUtils.CreateDelegate<TDelegate>(handler, typeof(Action<object, TEventArgs>).GetMethod(nameof(Action<object, TEventArgs>.Invoke)));
addHandler(d);
return Disposable.Create(() => removeHandler(d));
});
Expand Down Expand Up @@ -140,7 +140,7 @@ private static IObservable<EventPattern<TSender, TEventArgs>> FromEventPattern_<
var res = new AnonymousObservable<EventPattern<TSender, TEventArgs>>(observer =>
{
Action<TSender, TEventArgs> handler = (sender, eventArgs) => observer.OnNext(new EventPattern<TSender, TEventArgs>(sender, eventArgs));
var d = ReflectionUtils.CreateDelegate<TDelegate>(handler, typeof(Action<TSender, TEventArgs>).GetMethod("Invoke"));
var d = ReflectionUtils.CreateDelegate<TDelegate>(handler, typeof(Action<TSender, TEventArgs>).GetMethod(nameof(Action<TSender, TEventArgs>.Invoke)));
addHandler(d);
return Disposable.Create(() => removeHandler(d));
});
Expand Down Expand Up @@ -326,7 +326,7 @@ private static IObservable<TResult> FromEventPattern_<TSender, TEventArgs, TResu
return new AnonymousObservable<TResult>(observer =>
{
Action<TSender, TEventArgs> handler = (sender, eventArgs) => observer.OnNext(getResult(sender, eventArgs));
var d = ReflectionUtils.CreateDelegate(delegateType, handler, typeof(Action<TSender, TEventArgs>).GetMethod("Invoke"));
var d = ReflectionUtils.CreateDelegate(delegateType, handler, typeof(Action<TSender, TEventArgs>).GetMethod(nameof(Action<TSender, TEventArgs>.Invoke)));
var token = addMethod.Invoke(target, new object[] { d });
return Disposable.Create(() => removeMethod.Invoke(target, new object[] { token }));
});
Expand All @@ -340,7 +340,7 @@ private static IObservable<TResult> FromEventPattern_<TSender, TEventArgs, TResu
var res = new AnonymousObservable<TResult>(observer =>
{
Action<TSender, TEventArgs> handler = (sender, eventArgs) => observer.OnNext(getResult(sender, eventArgs));
var d = ReflectionUtils.CreateDelegate(delegateType, handler, typeof(Action<TSender, TEventArgs>).GetMethod("Invoke"));
var d = ReflectionUtils.CreateDelegate(delegateType, handler, typeof(Action<TSender, TEventArgs>).GetMethod(nameof(Action<TSender, TEventArgs>.Invoke)));
addMethod.Invoke(target, new object[] { d });
return Disposable.Create(() => removeMethod.Invoke(target, new object[] { d }));
});
Expand Down Expand Up @@ -407,7 +407,7 @@ private static IObservable<TEventArgs> FromEvent_<TDelegate, TEventArgs>(Action<
var res = new AnonymousObservable<TEventArgs>(observer =>
{
Action<TEventArgs> handler = observer.OnNext;
var d = ReflectionUtils.CreateDelegate<TDelegate>(handler, typeof(Action<TEventArgs>).GetMethod("Invoke"));
var d = ReflectionUtils.CreateDelegate<TDelegate>(handler, typeof(Action<TEventArgs>).GetMethod(nameof(Action<TEventArgs>.Invoke)));
addHandler(d);
return Disposable.Create(() => removeHandler(d));
});
Expand Down
4 changes: 2 additions & 2 deletions Rx.NET/Source/src/System.Reactive/ObservableQuery.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ IQueryable<TElement> IQueryProvider.CreateQuery<TElement>(Expression expression)
// observable.AsQbservable().<operators>.ToEnumerable().AsQueryable()
//
var call = expression as MethodCallExpression;
if (call == null || call.Method.DeclaringType != typeof(Qbservable) || call.Method.Name != "ToQueryable")
if (call == null || call.Method.DeclaringType != typeof(Qbservable) || call.Method.Name != nameof(Qbservable.ToQueryable))
throw new ArgumentException(Strings_Providers.EXPECTED_TOQUERYABLE_METHODCALL, nameof(expression));

//
Expand All @@ -50,7 +50,7 @@ IQueryable<TElement> IQueryProvider.CreateQuery<TElement>(Expression expression)
Expression.Call(
AsQueryable.MakeGenericMethod(typeof(TElement)),
Expression.Call(
typeof(Observable).GetMethod("ToEnumerable").MakeGenericMethod(typeof(TElement)),
typeof(Observable).GetMethod(nameof(Observable.ToEnumerable)).MakeGenericMethod(typeof(TElement)),
arg0
)
);
Expand Down
4 changes: 2 additions & 2 deletions Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/AsyncLockTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public void Wait(Action action)
{
try
{
instance.GetType().GetMethod("Wait").Invoke(instance, new object[] { action });
instance.GetType().GetMethod(nameof(AsyncLock.Wait)).Invoke(instance, new object[] { action });
}
catch (TargetInvocationException ex)
{
Expand All @@ -123,7 +123,7 @@ public void Dispose()
{
try
{
instance.GetType().GetMethod("Dispose").Invoke(instance, new object[0]);
instance.GetType().GetMethod(nameof(AsyncLock.Dispose)).Invoke(instance, new object[0]);
}
catch (TargetInvocationException ex)
{
Expand Down
20 changes: 10 additions & 10 deletions Rx.NET/Source/tests/Tests.System.Reactive/Tests/PrivateTypesTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,12 @@ public override bool Equals(object obj)

public override int GetHashCode()
{
return (int)_value.GetType().GetMethod("GetHashCode").Invoke(_value, null);
return (int)_value.GetType().GetMethod(nameof(GetHashCode)).Invoke(_value, null);
}

public override string ToString()
{
return (string)_value.GetType().GetMethod("ToString").Invoke(_value, null);
return (string)_value.GetType().GetMethod(nameof(ToString)).Invoke(_value, null);
}
}

Expand All @@ -169,28 +169,28 @@ class Either<TLeft, TRight> : EitherBase
public static Either<TLeft, TRight> CreateLeft(TLeft value)
{
var tpe = typeof(Observable).GetTypeInfo().Assembly.GetTypes().Single(t => t.Name == "Either`2").MakeGenericType(typeof(TLeft), typeof(TRight));
var mth = tpe.GetMethod("CreateLeft");
var mth = tpe.GetMethod(nameof(CreateLeft));
var res = mth.Invoke(null, new object[] { value });
return new Either<TLeft, TRight>.Left(res);
}

public static Either<TLeft, TRight> CreateRight(TRight value)
{
var tpe = typeof(Observable).GetTypeInfo().Assembly.GetTypes().Single(t => t.Name == "Either`2").MakeGenericType(typeof(TLeft), typeof(TRight));
var mth = tpe.GetMethod("CreateRight");
var mth = tpe.GetMethod(nameof(CreateRight));
var res = mth.Invoke(null, new object[] { value });
return new Either<TLeft, TRight>.Right(res);
}

public TResult Switch<TResult>(Func<TLeft, TResult> caseLeft, Func<TRight, TResult> caseRight)
{
var mth = _value.GetType().GetMethods().Where(m => m.Name == "Switch" && m.ReturnType != typeof(void)).Single().MakeGenericMethod(typeof(TResult));
var mth = _value.GetType().GetMethods().Where(m => m.Name == nameof(Switch) && m.ReturnType != typeof(void)).Single().MakeGenericMethod(typeof(TResult));
return (TResult)mth.Invoke(_value, new object[] { caseLeft, caseRight });
}

public void Switch(Action<TLeft> caseLeft, Action<TRight> caseRight)
{
var mth = _value.GetType().GetMethods().Where(m => m.Name == "Switch" && m.ReturnType == typeof(void)).Single();
var mth = _value.GetType().GetMethods().Where(m => m.Name == nameof(Switch) && m.ReturnType == typeof(void)).Single();
mth.Invoke(_value, new object[] { caseLeft, caseRight });
}

Expand All @@ -200,7 +200,7 @@ public TLeft Value
{
get
{
return (TLeft)_value.GetType().GetProperty("Value").GetValue(_value, null);
return (TLeft)_value.GetType().GetProperty(nameof(Value)).GetValue(_value, null);
}
}

Expand All @@ -211,7 +211,7 @@ public Left(object value)

public bool Equals(Left other)
{
var equ = _value.GetType().GetMethods().Where(m => m.Name == "Equals" && m.GetParameters()[0].ParameterType != typeof(object)).Single();
var equ = _value.GetType().GetMethods().Where(m => m.Name == nameof(Equals) && m.GetParameters()[0].ParameterType != typeof(object)).Single();
return (bool)equ.Invoke(_value, new object[] { other == null ? null : other._value });
}
}
Expand All @@ -222,7 +222,7 @@ public TRight Value
{
get
{
return (TRight)_value.GetType().GetProperty("Value").GetValue(_value, null);
return (TRight)_value.GetType().GetProperty(nameof(Value)).GetValue(_value, null);
}
}

Expand All @@ -233,7 +233,7 @@ public Right(object value)

public bool Equals(Right other)
{
var equ = _value.GetType().GetMethods().Where(m => m.Name == "Equals" && m.GetParameters()[0].ParameterType != typeof(object)).Single();
var equ = _value.GetType().GetMethods().Where(m => m.Name == nameof(Equals) && m.GetParameters()[0].ParameterType != typeof(object)).Single();
return (bool)equ.Invoke(_value, new object[] { other == null ? null : other._value });
}
}
Expand Down