From 95b7248e9ba1a4552809c24cd571d5aa60d5af48 Mon Sep 17 00:00:00 2001 From: Next Turn <45985406+NextTurn@users.noreply.github.com> Date: Sat, 14 Mar 2020 19:34:34 +0800 Subject: [PATCH] Fix indentations of nameof (#33586) --- .../Collections/Concurrent/BlockingCollection.cs | 6 +-- .../AccessControl/DirectoryObjectSecurity.cs | 6 +-- .../src/System/Security/AccessControl/ACE.cs | 40 +++++++++---------- .../src/System/Security/AccessControl/ACL.cs | 26 ++++++------ .../Security/AccessControl/CommonObjectSecurity.cs | 8 ++-- .../Security/AccessControl/ObjectSecurity.cs | 8 ++-- .../src/System/Security/AccessControl/Rules.cs | 2 +- .../Security/AccessControl/SecurityDescriptor.cs | 46 +++++++++++----------- .../src/System/Security/AccessControl/Win32.cs | 4 +- 9 files changed, 73 insertions(+), 73 deletions(-) diff --git a/src/libraries/System.Collections.Concurrent/src/System/Collections/Concurrent/BlockingCollection.cs b/src/libraries/System.Collections.Concurrent/src/System/Collections/Concurrent/BlockingCollection.cs index 4c4f2ad..71d94c8 100644 --- a/src/libraries/System.Collections.Concurrent/src/System/Collections/Concurrent/BlockingCollection.cs +++ b/src/libraries/System.Collections.Concurrent/src/System/Collections/Concurrent/BlockingCollection.cs @@ -177,7 +177,7 @@ namespace System.Collections.Concurrent if (boundedCapacity < 1) { throw new ArgumentOutOfRangeException( -nameof(boundedCapacity), boundedCapacity, + nameof(boundedCapacity), boundedCapacity, SR.BlockingCollection_ctor_BoundedCapacityRange); } if (collection == null) @@ -1707,7 +1707,7 @@ nameof(boundedCapacity), boundedCapacity, { //The number of WaitHandles must be <= 64 for MTA, and <=63 for STA, as we reserve one for CancellationToken throw new ArgumentOutOfRangeException( -nameof(collections), SR.BlockingCollection_ValidateCollectionsArray_LargeSize); + nameof(collections), SR.BlockingCollection_ValidateCollectionsArray_LargeSize); } for (int i = 0; i < collections.Length; ++i) @@ -1720,7 +1720,7 @@ nameof(collections), SR.BlockingCollection_ValidateCollectionsArray_LargeSize); if (collections[i]._isDisposed) throw new ObjectDisposedException( -nameof(collections), SR.BlockingCollection_ValidateCollectionsArray_DispElems); + nameof(collections), SR.BlockingCollection_ValidateCollectionsArray_DispElems); if (isAddOperation && collections[i].IsAddingCompleted) { diff --git a/src/libraries/System.IO.FileSystem.AccessControl/src/System/Security/AccessControl/DirectoryObjectSecurity.cs b/src/libraries/System.IO.FileSystem.AccessControl/src/System/Security/AccessControl/DirectoryObjectSecurity.cs index 6ec2ff8..0c8780a 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/src/System/Security/AccessControl/DirectoryObjectSecurity.cs +++ b/src/libraries/System.IO.FileSystem.AccessControl/src/System/Security/AccessControl/DirectoryObjectSecurity.cs @@ -332,7 +332,7 @@ namespace System.Security.AccessControl default: throw new ArgumentOutOfRangeException( -nameof(modification), + nameof(modification), SR.ArgumentOutOfRange_Enum); } } @@ -377,7 +377,7 @@ nameof(modification), default: throw new ArgumentOutOfRangeException( -nameof(modification), + nameof(modification), SR.ArgumentOutOfRange_Enum); } } @@ -471,7 +471,7 @@ nameof(modification), default: throw new ArgumentOutOfRangeException( -nameof(modification), + nameof(modification), SR.ArgumentOutOfRange_Enum); } diff --git a/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/ACE.cs b/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/ACE.cs index 90163fb..e33cbaa 100644 --- a/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/ACE.cs +++ b/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/ACE.cs @@ -120,8 +120,8 @@ namespace System.Security.AccessControl else if (offset < 0) { throw new ArgumentOutOfRangeException( -nameof(offset), - SR.ArgumentOutOfRange_NeedNonNegNum); + nameof(offset), + SR.ArgumentOutOfRange_NeedNonNegNum); } else if (binaryForm.Length - offset < BinaryLength) { @@ -130,8 +130,8 @@ nameof(offset), // throw new ArgumentOutOfRangeException( -nameof(binaryForm), - SR.ArgumentOutOfRange_ArrayTooSmall); + nameof(binaryForm), + SR.ArgumentOutOfRange_ArrayTooSmall); } else if (Length > ushort.MaxValue) { @@ -193,8 +193,8 @@ nameof(binaryForm), if (flags == AceFlags.None) { throw new ArgumentException( - SR.Arg_EnumAtLeastOneFlag, -nameof(auditFlags)); + SR.Arg_EnumAtLeastOneFlag, + nameof(auditFlags)); } return flags; @@ -251,8 +251,8 @@ nameof(auditFlags)); else if (offset < 0) { throw new ArgumentOutOfRangeException( -nameof(offset), - SR.ArgumentOutOfRange_NeedNonNegNum); + nameof(offset), + SR.ArgumentOutOfRange_NeedNonNegNum); } else if (binaryForm.Length - offset < HeaderLength) { @@ -261,8 +261,8 @@ nameof(offset), // throw new ArgumentOutOfRangeException( -nameof(binaryForm), - SR.ArgumentOutOfRange_ArrayTooSmall); + nameof(binaryForm), + SR.ArgumentOutOfRange_ArrayTooSmall); } else if ((binaryForm[offset + 3] << 8) + (binaryForm[offset + 2] << 0) > binaryForm.Length - offset) { @@ -272,8 +272,8 @@ nameof(binaryForm), // throw new ArgumentOutOfRangeException( -nameof(binaryForm), - SR.ArgumentOutOfRange_ArrayTooSmall); + nameof(binaryForm), + SR.ArgumentOutOfRange_ArrayTooSmall); } } @@ -392,8 +392,8 @@ nameof(binaryForm), InvalidParameter: throw new ArgumentException( - SR.ArgumentException_InvalidAceBinaryForm, -nameof(binaryForm)); + SR.ArgumentException_InvalidAceBinaryForm, + nameof(binaryForm)); } #endregion @@ -763,8 +763,8 @@ nameof(binaryForm)); if (type <= AceType.MaxDefinedAceType) { throw new ArgumentOutOfRangeException( -nameof(type), - SR.ArgumentOutOfRange_InvalidUserDefinedAceType); + nameof(type), + SR.ArgumentOutOfRange_InvalidUserDefinedAceType); } SetOpaque(opaque); @@ -827,13 +827,13 @@ nameof(type), if (opaque.Length > MaxOpaqueLength) { throw new ArgumentOutOfRangeException( -nameof(opaque), + nameof(opaque), SR.Format(SR.ArgumentOutOfRange_ArrayLength, 0, MaxOpaqueLength)); } else if (opaque.Length % 4 != 0) { throw new ArgumentOutOfRangeException( -nameof(opaque), + nameof(opaque), SR.Format(SR.ArgumentOutOfRange_ArrayLengthMultiple, 4)); } } @@ -1280,13 +1280,13 @@ nameof(opaque), if (opaque.Length > MaxOpaqueLengthInternal) { throw new ArgumentOutOfRangeException( -nameof(opaque), + nameof(opaque), SR.Format(SR.ArgumentOutOfRange_ArrayLength, 0, MaxOpaqueLengthInternal)); } else if (opaque.Length % 4 != 0) { throw new ArgumentOutOfRangeException( -nameof(opaque), + nameof(opaque), SR.Format(SR.ArgumentOutOfRange_ArrayLengthMultiple, 4)); } } diff --git a/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/ACL.cs b/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/ACL.cs index 2555299..2a65e0a 100644 --- a/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/ACL.cs +++ b/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/ACL.cs @@ -401,7 +401,7 @@ namespace System.Security.AccessControl throw new ArgumentException( SR.ArgumentException_InvalidAclBinaryForm, -nameof(binaryForm)); + nameof(binaryForm)); } #endregion @@ -1950,7 +1950,7 @@ nameof(binaryForm)); accessType != AccessControlType.Deny) { throw new ArgumentOutOfRangeException( -nameof(accessType), + nameof(accessType), SR.ArgumentOutOfRange_Enum); } } @@ -1968,20 +1968,20 @@ nameof(accessType), { throw new ArgumentException( SR.Argument_InvalidAnyFlag, -nameof(propagationFlags)); + nameof(propagationFlags)); } } else if (inheritanceFlags != InheritanceFlags.None) { throw new ArgumentException( SR.Argument_InvalidAnyFlag, -nameof(inheritanceFlags)); + nameof(inheritanceFlags)); } else if (propagationFlags != PropagationFlags.None) { throw new ArgumentException( SR.Argument_InvalidAnyFlag, -nameof(propagationFlags)); + nameof(propagationFlags)); } return; @@ -2007,14 +2007,14 @@ nameof(propagationFlags)); { throw new ArgumentException( SR.Arg_EnumAtLeastOneFlag, -nameof(flags)); + nameof(flags)); } if (accessMask == 0) { throw new ArgumentException( SR.Argument_ArgumentZero, -nameof(accessMask)); + nameof(accessMask)); } GenericAce newAce; @@ -2086,14 +2086,14 @@ nameof(accessMask)); { throw new ArgumentException( SR.Arg_EnumAtLeastOneFlag, -nameof(flags)); + nameof(flags)); } if (accessMask == 0) { throw new ArgumentException( SR.Argument_ArgumentZero, -nameof(accessMask)); + nameof(accessMask)); } ThrowIfNotCanonical(); @@ -2191,7 +2191,7 @@ nameof(accessMask)); { throw new ArgumentException( SR.Argument_ArgumentZero, -nameof(accessMask)); + nameof(accessMask)); } if (qualifier == AceQualifier.SystemAudit && @@ -2199,7 +2199,7 @@ nameof(accessMask)); { throw new ArgumentException( SR.Arg_EnumAtLeastOneFlag, -nameof(flags)); + nameof(flags)); } if (sid == null) @@ -2634,7 +2634,7 @@ nameof(flags)); { throw new ArgumentException( SR.Argument_ArgumentZero, -nameof(accessMask)); + nameof(accessMask)); } if (qualifier == AceQualifier.SystemAudit && @@ -2642,7 +2642,7 @@ nameof(accessMask)); { throw new ArgumentException( SR.Arg_EnumAtLeastOneFlag, -nameof(flags)); + nameof(flags)); } if (sid == null) diff --git a/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/CommonObjectSecurity.cs b/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/CommonObjectSecurity.cs index a174ad2..1ff7c7c 100644 --- a/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/CommonObjectSecurity.cs +++ b/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/CommonObjectSecurity.cs @@ -65,7 +65,7 @@ namespace System.Security.AccessControl { throw new ArgumentException( SR.Arg_MustBeIdentityReferenceType, -nameof(targetType)); + nameof(targetType)); } CommonAcl? acl = null; @@ -288,7 +288,7 @@ nameof(targetType)); default: throw new ArgumentOutOfRangeException( -nameof(modification), + nameof(modification), SR.ArgumentOutOfRange_Enum); } } @@ -329,7 +329,7 @@ nameof(modification), default: throw new ArgumentOutOfRangeException( -nameof(modification), + nameof(modification), SR.ArgumentOutOfRange_Enum); } } @@ -414,7 +414,7 @@ nameof(modification), default: throw new ArgumentOutOfRangeException( -nameof(modification), + nameof(modification), SR.ArgumentOutOfRange_Enum); } diff --git a/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/ObjectSecurity.cs b/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/ObjectSecurity.cs index 35b1bd0..6e220a5 100644 --- a/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/ObjectSecurity.cs +++ b/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/ObjectSecurity.cs @@ -598,7 +598,7 @@ namespace System.Security.AccessControl { throw new ArgumentException( SR.Arg_EnumAtLeastOneFlag, -nameof(includeSections)); + nameof(includeSections)); } WriteLock(); @@ -647,7 +647,7 @@ nameof(includeSections)); { throw new ArgumentException( SR.Arg_EnumAtLeastOneFlag, -nameof(includeSections)); + nameof(includeSections)); } WriteLock(); @@ -680,7 +680,7 @@ nameof(includeSections)); { throw new ArgumentException( SR.AccessControl_InvalidAccessRuleType, -nameof(rule)); + nameof(rule)); } WriteLock(); @@ -706,7 +706,7 @@ nameof(rule)); { throw new ArgumentException( SR.AccessControl_InvalidAuditRuleType, -nameof(rule)); + nameof(rule)); } WriteLock(); diff --git a/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/Rules.cs b/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/Rules.cs index 0e0bbfe..f386312 100644 --- a/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/Rules.cs +++ b/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/Rules.cs @@ -64,7 +64,7 @@ namespace System.Security.AccessControl { throw new ArgumentException( SR.Arg_MustBeIdentityReferenceType, -nameof(identity)); + nameof(identity)); } _identity = identity; diff --git a/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/SecurityDescriptor.cs b/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/SecurityDescriptor.cs index 736cbd5..81c74ad 100644 --- a/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/SecurityDescriptor.cs +++ b/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/SecurityDescriptor.cs @@ -272,7 +272,7 @@ namespace System.Security.AccessControl if (binaryForm.Length - offset < BinaryLength) { throw new ArgumentOutOfRangeException( -nameof(binaryForm), + nameof(binaryForm), SR.ArgumentOutOfRange_ArrayTooSmall); } @@ -497,8 +497,8 @@ nameof(binaryForm), if (binaryForm.Length - offset < HeaderLength) { throw new ArgumentOutOfRangeException( -nameof(binaryForm), - SR.ArgumentOutOfRange_ArrayTooSmall); + nameof(binaryForm), + SR.ArgumentOutOfRange_ArrayTooSmall); } // @@ -536,8 +536,8 @@ nameof(binaryForm), if ((flags & ControlFlags.SelfRelative) == 0) { throw new ArgumentException( - SR.AccessControl_InvalidSecurityDescriptorSelfRelativeForm, -nameof(binaryForm)); + SR.AccessControl_InvalidSecurityDescriptorSelfRelativeForm, + nameof(binaryForm)); } // @@ -651,8 +651,8 @@ nameof(binaryForm)); error == Interop.Errors.ERROR_UNKNOWN_REVISION) { throw new ArgumentException( - SR.ArgumentException_InvalidSDSddlForm, -nameof(sddlForm)); + SR.ArgumentException_InvalidSDSddlForm, + nameof(sddlForm)); } else if (error == Interop.Errors.ERROR_NOT_ENOUGH_MEMORY) { @@ -661,8 +661,8 @@ nameof(sddlForm)); else if (error == Interop.Errors.ERROR_INVALID_SID) { throw new ArgumentException( - SR.AccessControl_InvalidSidInSDDLString, -nameof(sddlForm)); + SR.AccessControl_InvalidSidInSDDLString, + nameof(sddlForm)); } else if (error != Interop.Errors.ERROR_SUCCESS) { @@ -839,20 +839,20 @@ nameof(sddlForm)); systemAcl.IsContainer != isContainer) { throw new ArgumentException( - isContainer ? + isContainer ? SR.AccessControl_MustSpecifyContainerAcl : SR.AccessControl_MustSpecifyLeafObjectAcl, -nameof(systemAcl)); + nameof(systemAcl)); } if (discretionaryAcl != null && discretionaryAcl.IsContainer != isContainer) { throw new ArgumentException( - isContainer ? + isContainer ? SR.AccessControl_MustSpecifyContainerAcl : SR.AccessControl_MustSpecifyLeafObjectAcl, -nameof(discretionaryAcl)); + nameof(discretionaryAcl)); } _isContainer = isContainer; @@ -861,10 +861,10 @@ nameof(discretionaryAcl)); systemAcl.IsDS != isDS) { throw new ArgumentException( - isDS ? + isDS ? SR.AccessControl_MustSpecifyDirectoryObjectAcl : SR.AccessControl_MustSpecifyNonDirectoryObjectAcl, -nameof(systemAcl)); + nameof(systemAcl)); } if (discretionaryAcl != null && @@ -874,7 +874,7 @@ nameof(systemAcl)); isDS ? SR.AccessControl_MustSpecifyDirectoryObjectAcl : SR.AccessControl_MustSpecifyNonDirectoryObjectAcl, -nameof(discretionaryAcl)); + nameof(discretionaryAcl)); } _isDS = isDS; @@ -1066,10 +1066,10 @@ nameof(discretionaryAcl)); if (value.IsContainer != this.IsContainer) { throw new ArgumentException( - this.IsContainer ? + this.IsContainer ? SR.AccessControl_MustSpecifyContainerAcl : SR.AccessControl_MustSpecifyLeafObjectAcl, -nameof(value)); + nameof(value)); } if (value.IsDS != this.IsDS) @@ -1078,7 +1078,7 @@ nameof(value)); this.IsDS ? SR.AccessControl_MustSpecifyDirectoryObjectAcl : SR.AccessControl_MustSpecifyNonDirectoryObjectAcl, -nameof(value)); + nameof(value)); } } @@ -1115,19 +1115,19 @@ nameof(value)); if (value.IsContainer != this.IsContainer) { throw new ArgumentException( - this.IsContainer ? + this.IsContainer ? SR.AccessControl_MustSpecifyContainerAcl : SR.AccessControl_MustSpecifyLeafObjectAcl, -nameof(value)); + nameof(value)); } if (value.IsDS != this.IsDS) { throw new ArgumentException( - this.IsDS ? + this.IsDS ? SR.AccessControl_MustSpecifyDirectoryObjectAcl : SR.AccessControl_MustSpecifyNonDirectoryObjectAcl, -nameof(value)); + nameof(value)); } } diff --git a/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/Win32.cs b/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/Win32.cs index e32eaea..c3b3d35 100644 --- a/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/Win32.cs +++ b/src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/Win32.cs @@ -127,7 +127,7 @@ namespace System.Security.AccessControl { throw new ArgumentException( SR.Argument_InvalidSafeHandle, -nameof(handle)); + nameof(handle)); } else { @@ -290,7 +290,7 @@ nameof(handle)); { throw new ArgumentException( SR.Argument_InvalidSafeHandle, -nameof(handle)); + nameof(handle)); } else { -- 2.7.4