Skip to content

Use CallerArgumentExpression on Requires.NotNull #19200

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

Merged
daxian-dbw merged 3 commits into from
Feb 23, 2023
Merged

Use CallerArgumentExpression on Requires.NotNull #19200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32c287b
Use `CallerArgumentExpression` on `Requires.NotNull`
xtqqczze Feb 23, 2023
762ff04
fix using
xtqqczze Feb 23, 2023
17e9498
fix nullable
xtqqczze Feb 23, 2023
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
4 changes: 2 additions & 2 deletions src/System.Management.Automation/engine/ComInterop/BoundDispEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private static void VerifyHandler(object handler)
/// <returns>The original event with handler added.</returns>
private object InPlaceAdd(object handler)
{
Requires.NotNull(handler, nameof(handler));
Requires.NotNull(handler);
VerifyHandler(handler);

ComEventsSink comEventSink = ComEventsSink.FromRuntimeCallableWrapper(_rcw, _sourceIid, true);
Expand All @@ -88,7 +88,7 @@ private object InPlaceAdd(object handler)
/// <returns>The original event with handler removed.</returns>
private object InPlaceSubtract(object handler)
{
Requires.NotNull(handler, nameof(handler));
Requires.NotNull(handler);
VerifyHandler(handler);

ComEventsSink comEventSink = ComEventsSink.FromRuntimeCallableWrapper(_rcw, _sourceIid, false);
Expand Down
44 changes: 22 additions & 22 deletions src/System.Management.Automation/engine/ComInterop/ComBinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public static bool IsComObject(object value)
/// <returns>True if operation was bound successfully; otherwise, false.</returns>
public static bool TryBindGetMember(GetMemberBinder binder, DynamicMetaObject instance, out DynamicMetaObject result, bool delayInvocation)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(instance, nameof(instance));
Requires.NotNull(binder);
Requires.NotNull(instance);

if (TryGetMetaObject(ref instance))
{
Expand Down Expand Up @@ -66,9 +66,9 @@ public static bool TryBindGetMember(GetMemberBinder binder, DynamicMetaObject in
/// <returns>True if operation was bound successfully; otherwise, false.</returns>
public static bool TryBindSetMember(SetMemberBinder binder, DynamicMetaObject instance, DynamicMetaObject value, out DynamicMetaObject result)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(instance, nameof(instance));
Requires.NotNull(value, nameof(value));
Requires.NotNull(binder);
Requires.NotNull(instance);
Requires.NotNull(value);

if (TryGetMetaObject(ref instance))
{
Expand All @@ -91,9 +91,9 @@ public static bool TryBindSetMember(SetMemberBinder binder, DynamicMetaObject in
/// <returns>True if operation was bound successfully; otherwise, false.</returns>
public static bool TryBindInvoke(InvokeBinder binder, DynamicMetaObject instance, DynamicMetaObject[] args, out DynamicMetaObject result)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(instance, nameof(instance));
Requires.NotNull(args, nameof(args));
Requires.NotNull(binder);
Requires.NotNull(instance);
Requires.NotNull(args);

if (TryGetMetaObjectInvoke(ref instance))
{
Expand All @@ -116,9 +116,9 @@ public static bool TryBindInvoke(InvokeBinder binder, DynamicMetaObject instance
/// <returns>True if operation was bound successfully; otherwise, false.</returns>
public static bool TryBindInvokeMember(InvokeMemberBinder binder, bool isSetProperty, DynamicMetaObject instance, DynamicMetaObject[] args, out DynamicMetaObject result)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(instance, nameof(instance));
Requires.NotNull(args, nameof(args));
Requires.NotNull(binder);
Requires.NotNull(instance);
Requires.NotNull(args);

if (TryGetMetaObject(ref instance))
{
Expand Down Expand Up @@ -158,9 +158,9 @@ public static bool TryBindInvokeMember(InvokeMemberBinder binder, bool isSetProp
/// <returns>True if operation was bound successfully; otherwise, false.</returns>
public static bool TryBindGetIndex(GetIndexBinder binder, DynamicMetaObject instance, DynamicMetaObject[] args, out DynamicMetaObject result)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(instance, nameof(instance));
Requires.NotNull(args, nameof(args));
Requires.NotNull(binder);
Requires.NotNull(instance);
Requires.NotNull(args);

if (TryGetMetaObjectInvoke(ref instance))
{
Expand All @@ -183,10 +183,10 @@ public static bool TryBindGetIndex(GetIndexBinder binder, DynamicMetaObject inst
/// <returns>True if operation was bound successfully; otherwise, false.</returns>
public static bool TryBindSetIndex(SetIndexBinder binder, DynamicMetaObject instance, DynamicMetaObject[] args, DynamicMetaObject value, out DynamicMetaObject result)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(instance, nameof(instance));
Requires.NotNull(args, nameof(args));
Requires.NotNull(value, nameof(value));
Requires.NotNull(binder);
Requires.NotNull(instance);
Requires.NotNull(args);
Requires.NotNull(value);

if (TryGetMetaObjectInvoke(ref instance))
{
Expand All @@ -208,8 +208,8 @@ public static bool TryBindSetIndex(SetIndexBinder binder, DynamicMetaObject inst
/// <returns>True if operation was bound successfully; otherwise, false.</returns>
public static bool TryConvert(ConvertBinder binder, DynamicMetaObject instance, out DynamicMetaObject result)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(instance, nameof(instance));
Requires.NotNull(binder);
Requires.NotNull(instance);

if (IsComObject(instance.Value))
{
Expand Down Expand Up @@ -245,7 +245,7 @@ public static bool TryConvert(ConvertBinder binder, DynamicMetaObject instance,
/// <returns>The collection of member names.</returns>
internal static IList<string> GetDynamicDataMemberNames(object value)
{
Requires.NotNull(value, nameof(value));
Requires.NotNull(value);
Requires.Condition(IsComObject(value), nameof(value));

return ComObject.ObjectToComObject(value).GetMemberNames(true);
Expand All @@ -260,7 +260,7 @@ internal static IList<string> GetDynamicDataMemberNames(object value)
/// <returns>The collection of pairs that represent data member's names and their data.</returns>
internal static IList<KeyValuePair<string, object>> GetDynamicDataMembers(object value, IEnumerable<string> names)
{
Requires.NotNull(value, nameof(value));
Requires.NotNull(value);
Requires.Condition(IsComObject(value), nameof(value));

return ComObject.ObjectToComObject(value).GetMembers(names);
Expand Down
10 changes: 5 additions & 5 deletions src/System.Management.Automation/engine/ComInterop/ComFallbackMetaObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,31 @@ internal ComFallbackMetaObject(Expression expression, BindingRestrictions restri

public override DynamicMetaObject BindGetIndex(GetIndexBinder binder, DynamicMetaObject[] indexes)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(binder);
return binder.FallbackGetIndex(UnwrapSelf(), indexes);
}

public override DynamicMetaObject BindSetIndex(SetIndexBinder binder, DynamicMetaObject[] indexes, DynamicMetaObject value)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(binder);
return binder.FallbackSetIndex(UnwrapSelf(), indexes, value);
}

public override DynamicMetaObject BindGetMember(GetMemberBinder binder)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(binder);
return binder.FallbackGetMember(UnwrapSelf());
}

public override DynamicMetaObject BindInvokeMember(InvokeMemberBinder binder, DynamicMetaObject[] args)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(binder);
return binder.FallbackInvokeMember(UnwrapSelf(), args);
}

public override DynamicMetaObject BindSetMember(SetMemberBinder binder, DynamicMetaObject value)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(binder);
return binder.FallbackSetMember(UnwrapSelf(), value);
}

Expand Down
12 changes: 6 additions & 6 deletions src/System.Management.Automation/engine/ComInterop/ComMetaObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,37 +16,37 @@ internal ComMetaObject(Expression expression, BindingRestrictions restrictions,

public override DynamicMetaObject BindInvokeMember(InvokeMemberBinder binder, DynamicMetaObject[] args)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(binder);
return binder.Defer(args.AddFirst(WrapSelf()));
}

public override DynamicMetaObject BindInvoke(InvokeBinder binder, DynamicMetaObject[] args)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(binder);
return binder.Defer(args.AddFirst(WrapSelf()));
}

public override DynamicMetaObject BindGetMember(GetMemberBinder binder)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(binder);
return binder.Defer(WrapSelf());
}

public override DynamicMetaObject BindSetMember(SetMemberBinder binder, DynamicMetaObject value)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(binder);
return binder.Defer(WrapSelf(), value);
}

public override DynamicMetaObject BindGetIndex(GetIndexBinder binder, DynamicMetaObject[] indexes)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(binder);
return binder.Defer(WrapSelf(), indexes);
}

public override DynamicMetaObject BindSetIndex(SetIndexBinder binder, DynamicMetaObject[] indexes, DynamicMetaObject value)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(binder);
return binder.Defer(WrapSelf(), indexes.AddLast(value));
}

Expand Down
5 changes: 4 additions & 1 deletion src/System.Management.Automation/engine/ComInterop/Helpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#nullable enable

using System;
using System.Linq.Expressions;
using System.Runtime.CompilerServices;

namespace System.Management.Automation.ComInterop
{
Expand Down Expand Up @@ -33,7 +36,7 @@ internal static Expression Convert(Expression expression, Type type)
internal static class Requires
{
[System.Diagnostics.Conditional("DEBUG")]
internal static void NotNull(object value, string paramName)
internal static void NotNull(object value, [CallerArgumentExpression("value")] string? paramName = null)
{
ArgumentNullException.ThrowIfNull(value, paramName);
}
Expand Down
12 changes: 6 additions & 6 deletions src/System.Management.Automation/engine/ComInterop/IDispatchMetaObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ internal IDispatchMetaObject(Expression expression, IDispatchComObject self)

public override DynamicMetaObject BindInvokeMember(InvokeMemberBinder binder, DynamicMetaObject[] args)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(binder);

ComMethodDesc method = null;

Expand Down Expand Up @@ -63,7 +63,7 @@ public override DynamicMetaObject BindInvokeMember(InvokeMemberBinder binder, Dy

public override DynamicMetaObject BindInvoke(InvokeBinder binder, DynamicMetaObject[] args)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(binder);

if (_self.TryGetGetItem(out ComMethodDesc method))
{
Expand Down Expand Up @@ -108,7 +108,7 @@ public override DynamicMetaObject BindGetMember(GetMemberBinder binder)
ComBinder.ComGetMemberBinder comBinder = binder as ComBinder.ComGetMemberBinder;
bool canReturnCallables = comBinder?._canReturnCallables ?? false;

Requires.NotNull(binder, nameof(binder));
Requires.NotNull(binder);

// 1. Try methods
if (_self.TryGetMemberMethod(binder.Name, out ComMethodDesc method))
Expand Down Expand Up @@ -187,7 +187,7 @@ private DynamicMetaObject BindEvent(ComEventDesc eventDesc)

public override DynamicMetaObject BindGetIndex(GetIndexBinder binder, DynamicMetaObject[] indexes)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(binder);

if (_self.TryGetGetItem(out ComMethodDesc getItem))
{
Expand All @@ -203,7 +203,7 @@ public override DynamicMetaObject BindGetIndex(GetIndexBinder binder, DynamicMet

public override DynamicMetaObject BindSetIndex(SetIndexBinder binder, DynamicMetaObject[] indexes, DynamicMetaObject value)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(binder);

if (_self.TryGetSetItem(out ComMethodDesc setItem))
{
Expand Down Expand Up @@ -238,7 +238,7 @@ public override DynamicMetaObject BindSetIndex(SetIndexBinder binder, DynamicMet

public override DynamicMetaObject BindSetMember(SetMemberBinder binder, DynamicMetaObject value)
{
Requires.NotNull(binder, nameof(binder));
Requires.NotNull(binder);

return
// 1. Check for simple property put
Expand Down