Win7/PowerShell7
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Enable SA1008 Opening parenthesis should be spaced correctly (#14242)

Browse Source
This commit is contained in:
xtqqczze 2021-04-16 18:33:02 +01:00 committed by GitHub
parent 1feed0671a
commit a562fa6bd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.globalconfig
View File

@ -1038,7 +1038,7 @@ dotnet_diagnostic.SA1006.severity = warning
dotnet_diagnostic.SA1007.severity = warning dotnet_diagnostic.SA1007.severity = warning
# SA1008: Opening parenthesis should be spaced correctly # SA1008: Opening parenthesis should be spaced correctly
dotnet_diagnostic.SA1008.severity = none dotnet_diagnostic.SA1008.severity = warning
# SA1009: Closing parenthesis should be spaced correctly # SA1009: Closing parenthesis should be spaced correctly
dotnet_diagnostic.SA1009.severity = none dotnet_diagnostic.SA1009.severity = none

8
src/System.Management.Automation/engine/Modules/AnalysisCache.cs
View File

@ -33,7 +33,7 @@ namespace System.Management.Automation
// This dictionary shouldn't see much use, so low concurrency and capacity // This dictionary shouldn't see much use, so low concurrency and capacity
private static readonly ConcurrentDictionary<string, string> s_modulesBeingAnalyzed = private static readonly ConcurrentDictionary<string, string> s_modulesBeingAnalyzed =
new ConcurrentDictionary<string, string>( /*concurrency*/1, /*capacity*/2, StringComparer.OrdinalIgnoreCase); new(concurrencyLevel: 1, capacity: 2, StringComparer.OrdinalIgnoreCase);
internal static readonly char[] InvalidCommandNameCharacters = new[] internal static readonly char[] InvalidCommandNameCharacters = new[]
{ {
@ -384,8 +384,10 @@ namespace System.Management.Automation
} }
} }
var exportedClasses = new ConcurrentDictionary<string, TypeAttributes>( /*concurrency*/ ConcurrentDictionary<string, TypeAttributes> exportedClasses = new(
1, scriptAnalysis.DiscoveredClasses.Count, StringComparer.OrdinalIgnoreCase); concurrencyLevel: 1,
capacity: scriptAnalysis.DiscoveredClasses.Count,
StringComparer.OrdinalIgnoreCase);
foreach (var exportedClass in scriptAnalysis.DiscoveredClasses) foreach (var exportedClass in scriptAnalysis.DiscoveredClasses)
{ {
exportedClasses[exportedClass.Name] = exportedClass.TypeAttributes; exportedClasses[exportedClass.Name] = exportedClass.TypeAttributes;

46
src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs
View File

@ -33,7 +33,7 @@ namespace System.Management.Automation.Remoting
/// <param name="extraInfo">PCWSTR.</param> /// <param name="extraInfo">PCWSTR.</param>
/// <param name="startupInfo">WSMAN_SHELL_STARTUP_INFO*.</param> /// <param name="startupInfo">WSMAN_SHELL_STARTUP_INFO*.</param>
/// <param name="inboundShellInformation">WSMAN_DATA*.</param> /// <param name="inboundShellInformation">WSMAN_DATA*.</param>
internal delegate void WSMPluginShellDelegate( // TODO: Rename to WSManPluginShellDelegate once I remove the MC++ module. internal delegate void WSManPluginShellDelegate(
IntPtr pluginContext, IntPtr pluginContext,
IntPtr requestDetails, IntPtr requestDetails,
int flags, int flags,
@ -45,7 +45,7 @@ namespace System.Management.Automation.Remoting
/// </summary> /// </summary>
/// <param name="pluginContext">PVOID.</param> /// <param name="pluginContext">PVOID.</param>
/// <param name="shellContext">PVOID.</param> /// <param name="shellContext">PVOID.</param>
internal delegate void WSMPluginReleaseShellContextDelegate( internal delegate void WSManPluginReleaseShellContextDelegate(
IntPtr pluginContext, IntPtr pluginContext,
IntPtr shellContext); IntPtr shellContext);
@ -57,7 +57,7 @@ namespace System.Management.Automation.Remoting
/// <param name="shellContext">PVOID.</param> /// <param name="shellContext">PVOID.</param>
/// <param name="commandContext">PVOID optional.</param> /// <param name="commandContext">PVOID optional.</param>
/// <param name="inboundConnectInformation">WSMAN_DATA* optional.</param> /// <param name="inboundConnectInformation">WSMAN_DATA* optional.</param>
internal delegate void WSMPluginConnectDelegate( internal delegate void WSManPluginConnectDelegate(
IntPtr pluginContext, IntPtr pluginContext,
IntPtr requestDetails, IntPtr requestDetails,
int flags, int flags,
@ -73,7 +73,7 @@ namespace System.Management.Automation.Remoting
/// <param name="shellContext">PVOID.</param> /// <param name="shellContext">PVOID.</param>
/// <param name="commandLine">PCWSTR.</param> /// <param name="commandLine">PCWSTR.</param>
/// <param name="arguments">WSMAN_COMMAND_ARG_SET*.</param> /// <param name="arguments">WSMAN_COMMAND_ARG_SET*.</param>
internal delegate void WSMPluginCommandDelegate( internal delegate void WSManPluginCommandDelegate(
IntPtr pluginContext, IntPtr pluginContext,
IntPtr requestDetails, IntPtr requestDetails,
int flags, int flags,
@ -85,7 +85,7 @@ namespace System.Management.Automation.Remoting
/// Delegate that is passed to native layer for callback on operation shutdown notifications. /// Delegate that is passed to native layer for callback on operation shutdown notifications.
/// </summary> /// </summary>
/// <param name="shutdownContext">IntPtr.</param> /// <param name="shutdownContext">IntPtr.</param>
internal delegate void WSMPluginOperationShutdownDelegate( internal delegate void WSManPluginOperationShutdownDelegate(
IntPtr shutdownContext); IntPtr shutdownContext);
/// <summary> /// <summary>
@ -93,7 +93,7 @@ namespace System.Management.Automation.Remoting
/// <param name="pluginContext">PVOID.</param> /// <param name="pluginContext">PVOID.</param>
/// <param name="shellContext">PVOID.</param> /// <param name="shellContext">PVOID.</param>
/// <param name="commandContext">PVOID.</param> /// <param name="commandContext">PVOID.</param>
internal delegate void WSMPluginReleaseCommandContextDelegate( internal delegate void WSManPluginReleaseCommandContextDelegate(
IntPtr pluginContext, IntPtr pluginContext,
IntPtr shellContext, IntPtr shellContext,
IntPtr commandContext); IntPtr commandContext);
@ -107,7 +107,7 @@ namespace System.Management.Automation.Remoting
/// <param name="commandContext">PVOID.</param> /// <param name="commandContext">PVOID.</param>
/// <param name="stream">PCWSTR.</param> /// <param name="stream">PCWSTR.</param>
/// <param name="inboundData">WSMAN_DATA*.</param> /// <param name="inboundData">WSMAN_DATA*.</param>
internal delegate void WSMPluginSendDelegate( internal delegate void WSManPluginSendDelegate(
IntPtr pluginContext, IntPtr pluginContext,
IntPtr requestDetails, IntPtr requestDetails,
int flags, int flags,
@ -124,7 +124,7 @@ namespace System.Management.Automation.Remoting
/// <param name="shellContext">PVOID.</param> /// <param name="shellContext">PVOID.</param>
/// <param name="commandContext">PVOID optional.</param> /// <param name="commandContext">PVOID optional.</param>
/// <param name="streamSet">WSMAN_STREAM_ID_SET* optional.</param> /// <param name="streamSet">WSMAN_STREAM_ID_SET* optional.</param>
internal delegate void WSMPluginReceiveDelegate( internal delegate void WSManPluginReceiveDelegate(
IntPtr pluginContext, IntPtr pluginContext,
IntPtr requestDetails, IntPtr requestDetails,
int flags, int flags,
@ -140,7 +140,7 @@ namespace System.Management.Automation.Remoting
/// <param name="shellContext">PVOID.</param> /// <param name="shellContext">PVOID.</param>
/// <param name="commandContext">PVOID optional.</param> /// <param name="commandContext">PVOID optional.</param>
/// <param name="code">PCWSTR.</param> /// <param name="code">PCWSTR.</param>
internal delegate void WSMPluginSignalDelegate( internal delegate void WSManPluginSignalDelegate(
IntPtr pluginContext, IntPtr pluginContext,
IntPtr requestDetails, IntPtr requestDetails,
int flags, int flags,
@ -160,7 +160,7 @@ namespace System.Management.Automation.Remoting
/// <summary> /// <summary>
/// </summary> /// </summary>
/// <param name="pluginContext">PVOID.</param> /// <param name="pluginContext">PVOID.</param>
internal delegate void WSMShutdownPluginDelegate( internal delegate void WSManShutdownPluginDelegate(
IntPtr pluginContext); IntPtr pluginContext);
/// <summary> /// <summary>
@ -192,7 +192,7 @@ namespace System.Management.Automation.Remoting
private GCHandle _pluginSignalGCHandle; private GCHandle _pluginSignalGCHandle;
private GCHandle _pluginConnectGCHandle; private GCHandle _pluginConnectGCHandle;
private GCHandle _shutdownPluginGCHandle; private GCHandle _shutdownPluginGCHandle;
private GCHandle _WSMPluginOperationShutdownGCHandle; private GCHandle _WSManPluginOperationShutdownGCHandle;
#endregion #endregion
@ -255,57 +255,57 @@ namespace System.Management.Automation.Remoting
// disposal. Using GCHandle without pinning reduces fragmentation potential // disposal. Using GCHandle without pinning reduces fragmentation potential
// of the managed heap. // of the managed heap.
{ {
WSMPluginShellDelegate pluginShell = new WSMPluginShellDelegate(WSManPluginManagedEntryWrapper.WSManPluginShell); WSManPluginShellDelegate pluginShell = new WSManPluginShellDelegate(WSManPluginManagedEntryWrapper.WSManPluginShell);
_pluginShellGCHandle = GCHandle.Alloc(pluginShell); _pluginShellGCHandle = GCHandle.Alloc(pluginShell);
// marshal the delegate to a unmanaged function pointer so that AppDomain reference is stored correctly. // marshal the delegate to a unmanaged function pointer so that AppDomain reference is stored correctly.
// Populate the outgoing structure so the caller has access to the entry points // Populate the outgoing structure so the caller has access to the entry points
_unmanagedStruct.wsManPluginShellCallbackNative = Marshal.GetFunctionPointerForDelegate(pluginShell); _unmanagedStruct.wsManPluginShellCallbackNative = Marshal.GetFunctionPointerForDelegate(pluginShell);
} }
{ {
WSMPluginReleaseShellContextDelegate pluginReleaseShellContext = new WSMPluginReleaseShellContextDelegate(WSManPluginManagedEntryWrapper.WSManPluginReleaseShellContext); WSManPluginReleaseShellContextDelegate pluginReleaseShellContext = new WSManPluginReleaseShellContextDelegate(WSManPluginManagedEntryWrapper.WSManPluginReleaseShellContext);
_pluginReleaseShellContextGCHandle = GCHandle.Alloc(pluginReleaseShellContext); _pluginReleaseShellContextGCHandle = GCHandle.Alloc(pluginReleaseShellContext);
_unmanagedStruct.wsManPluginReleaseShellContextCallbackNative = Marshal.GetFunctionPointerForDelegate(pluginReleaseShellContext); _unmanagedStruct.wsManPluginReleaseShellContextCallbackNative = Marshal.GetFunctionPointerForDelegate(pluginReleaseShellContext);
} }
{ {
WSMPluginCommandDelegate pluginCommand = new WSMPluginCommandDelegate(WSManPluginManagedEntryWrapper.WSManPluginCommand); WSManPluginCommandDelegate pluginCommand = new WSManPluginCommandDelegate(WSManPluginManagedEntryWrapper.WSManPluginCommand);
_pluginCommandGCHandle = GCHandle.Alloc(pluginCommand); _pluginCommandGCHandle = GCHandle.Alloc(pluginCommand);
_unmanagedStruct.wsManPluginCommandCallbackNative = Marshal.GetFunctionPointerForDelegate(pluginCommand); _unmanagedStruct.wsManPluginCommandCallbackNative = Marshal.GetFunctionPointerForDelegate(pluginCommand);
} }
{ {
WSMPluginReleaseCommandContextDelegate pluginReleaseCommandContext = new WSMPluginReleaseCommandContextDelegate(WSManPluginManagedEntryWrapper.WSManPluginReleaseCommandContext); WSManPluginReleaseCommandContextDelegate pluginReleaseCommandContext = new WSManPluginReleaseCommandContextDelegate(WSManPluginManagedEntryWrapper.WSManPluginReleaseCommandContext);
_pluginReleaseCommandContextGCHandle = GCHandle.Alloc(pluginReleaseCommandContext); _pluginReleaseCommandContextGCHandle = GCHandle.Alloc(pluginReleaseCommandContext);
_unmanagedStruct.wsManPluginReleaseCommandContextCallbackNative = Marshal.GetFunctionPointerForDelegate(pluginReleaseCommandContext); _unmanagedStruct.wsManPluginReleaseCommandContextCallbackNative = Marshal.GetFunctionPointerForDelegate(pluginReleaseCommandContext);
} }
{ {
WSMPluginSendDelegate pluginSend = new WSMPluginSendDelegate(WSManPluginManagedEntryWrapper.WSManPluginSend); WSManPluginSendDelegate pluginSend = new WSManPluginSendDelegate(WSManPluginManagedEntryWrapper.WSManPluginSend);
_pluginSendGCHandle = GCHandle.Alloc(pluginSend); _pluginSendGCHandle = GCHandle.Alloc(pluginSend);
_unmanagedStruct.wsManPluginSendCallbackNative = Marshal.GetFunctionPointerForDelegate(pluginSend); _unmanagedStruct.wsManPluginSendCallbackNative = Marshal.GetFunctionPointerForDelegate(pluginSend);
} }
{ {
WSMPluginReceiveDelegate pluginReceive = new WSMPluginReceiveDelegate(WSManPluginManagedEntryWrapper.WSManPluginReceive); WSManPluginReceiveDelegate pluginReceive = new WSManPluginReceiveDelegate(WSManPluginManagedEntryWrapper.WSManPluginReceive);
_pluginReceiveGCHandle = GCHandle.Alloc(pluginReceive); _pluginReceiveGCHandle = GCHandle.Alloc(pluginReceive);
_unmanagedStruct.wsManPluginReceiveCallbackNative = Marshal.GetFunctionPointerForDelegate(pluginReceive); _unmanagedStruct.wsManPluginReceiveCallbackNative = Marshal.GetFunctionPointerForDelegate(pluginReceive);
} }
{ {
WSMPluginSignalDelegate pluginSignal = new WSMPluginSignalDelegate(WSManPluginManagedEntryWrapper.WSManPluginSignal); WSManPluginSignalDelegate pluginSignal = new WSManPluginSignalDelegate(WSManPluginManagedEntryWrapper.WSManPluginSignal);
_pluginSignalGCHandle = GCHandle.Alloc(pluginSignal); _pluginSignalGCHandle = GCHandle.Alloc(pluginSignal);
_unmanagedStruct.wsManPluginSignalCallbackNative = Marshal.GetFunctionPointerForDelegate(pluginSignal); _unmanagedStruct.wsManPluginSignalCallbackNative = Marshal.GetFunctionPointerForDelegate(pluginSignal);
} }
{ {
WSMPluginConnectDelegate pluginConnect = new WSMPluginConnectDelegate(WSManPluginManagedEntryWrapper.WSManPluginConnect); WSManPluginConnectDelegate pluginConnect = new WSManPluginConnectDelegate(WSManPluginManagedEntryWrapper.WSManPluginConnect);
_pluginConnectGCHandle = GCHandle.Alloc(pluginConnect); _pluginConnectGCHandle = GCHandle.Alloc(pluginConnect);
_unmanagedStruct.wsManPluginConnectCallbackNative = Marshal.GetFunctionPointerForDelegate(pluginConnect); _unmanagedStruct.wsManPluginConnectCallbackNative = Marshal.GetFunctionPointerForDelegate(pluginConnect);
} }
{ {
WSMShutdownPluginDelegate shutdownPlugin = new WSMShutdownPluginDelegate(WSManPluginManagedEntryWrapper.ShutdownPlugin); WSManShutdownPluginDelegate shutdownPlugin = new WSManShutdownPluginDelegate(WSManPluginManagedEntryWrapper.ShutdownPlugin);
_shutdownPluginGCHandle = GCHandle.Alloc(shutdownPlugin); _shutdownPluginGCHandle = GCHandle.Alloc(shutdownPlugin);
_unmanagedStruct.wsManPluginShutdownPluginCallbackNative = Marshal.GetFunctionPointerForDelegate(shutdownPlugin); _unmanagedStruct.wsManPluginShutdownPluginCallbackNative = Marshal.GetFunctionPointerForDelegate(shutdownPlugin);
} }
if (!Platform.IsWindows) if (!Platform.IsWindows)
{ {
WSMPluginOperationShutdownDelegate pluginShutDownDelegate = new WSMPluginOperationShutdownDelegate(WSManPluginManagedEntryWrapper.WSManPSShutdown); WSManPluginOperationShutdownDelegate pluginShutDownDelegate = new WSManPluginOperationShutdownDelegate(WSManPluginManagedEntryWrapper.WSManPSShutdown);
_WSMPluginOperationShutdownGCHandle = GCHandle.Alloc(pluginShutDownDelegate); _WSManPluginOperationShutdownGCHandle = GCHandle.Alloc(pluginShutDownDelegate);
_unmanagedStruct.wsManPluginShutdownCallbackNative = Marshal.GetFunctionPointerForDelegate(pluginShutDownDelegate); _unmanagedStruct.wsManPluginShutdownCallbackNative = Marshal.GetFunctionPointerForDelegate(pluginShutDownDelegate);
} }
} }
@ -328,7 +328,7 @@ namespace System.Management.Automation.Remoting
_shutdownPluginGCHandle.Free(); _shutdownPluginGCHandle.Free();
if (!Platform.IsWindows) if (!Platform.IsWindows)
{ {
_WSMPluginOperationShutdownGCHandle.Free(); _WSManPluginOperationShutdownGCHandle.Free();
} }
} }
} }

2
test/tools/WebListener/Controllers/ResponseController.cs
View File

@ -41,7 +41,7 @@ namespace mvc.Controllers
} }
StringValues responsePhrase; StringValues responsePhrase;
if ( Request.Query.TryGetValue("responsephrase", out responsePhrase)) if (Request.Query.TryGetValue("responsephrase", out responsePhrase))
{ {
Response.HttpContext.Features.Get<IHttpResponseFeature>().ReasonPhrase = responsePhrase.FirstOrDefault(); Response.HttpContext.Features.Get<IHttpResponseFeature>().ReasonPhrase = responsePhrase.FirstOrDefault();
} }

2
test/tools/WebListener/DeflateFilter.cs
View File

@ -11,7 +11,7 @@ namespace mvc.Controllers
{ {
internal sealed class DeflateFilter : ResultFilterAttribute internal sealed class DeflateFilter : ResultFilterAttribute
{ {
public override async Task OnResultExecutionAsync( ResultExecutingContext context, ResultExecutionDelegate next) public override async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
{ {
var httpContext = context.HttpContext; var httpContext = context.HttpContext;
using (var memoryStream = new MemoryStream()) using (var memoryStream = new MemoryStream())

2
test/tools/WebListener/GzipFilter.cs
View File

@ -11,7 +11,7 @@ namespace mvc.Controllers
{ {
internal sealed class GzipFilter : ResultFilterAttribute internal sealed class GzipFilter : ResultFilterAttribute
{ {
public override async Task OnResultExecutionAsync( ResultExecutingContext context, ResultExecutionDelegate next) public override async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
{ {
var httpContext = context.HttpContext; var httpContext = context.HttpContext;
using (var memoryStream = new MemoryStream()) using (var memoryStream = new MemoryStream())