mirror of
https://github.com/aphrody-labs/PowerShell.git
synced 2026-10-17 12:45:47 +00:00
Fix IDE0090: Simplify new expression part 6 (#14338)
https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0090
This commit is contained in:
1 parent
b007952f74
commit
bb78d4b5c0
8 files changed
+97
-96
No files matched your search
@@ -17,14 +17,14 @@ namespace Microsoft.PowerShell.Cmdletization
|
||||
|
||||
private static ModuleBuilder CreateModuleBuilder()
|
||||
{
|
||||
AssemblyName aName = new AssemblyName(namespacePrefix);
|
||||
AssemblyName aName = new(namespacePrefix);
|
||||
AssemblyBuilder ab = AssemblyBuilder.DefineDynamicAssembly(aName, AssemblyBuilderAccess.Run);
|
||||
ModuleBuilder mb = ab.DefineDynamicModule(aName.Name);
|
||||
return mb;
|
||||
}
|
||||
|
||||
private static Lazy<ModuleBuilder> s_moduleBuilder = new Lazy<ModuleBuilder>(CreateModuleBuilder, isThreadSafe: true);
|
||||
private static object s_moduleBuilderUsageLock = new object();
|
||||
private static Lazy<ModuleBuilder> s_moduleBuilder = new(CreateModuleBuilder, isThreadSafe: true);
|
||||
private static object s_moduleBuilderUsageLock = new();
|
||||
|
||||
internal static string GetEnumFullName(EnumMetadataEnum enumMetadata)
|
||||
{
|
||||
|
||||
@@ -54,7 +54,7 @@ namespace Microsoft.PowerShell.Cmdletization
|
||||
|
||||
internal IEnumerable<T> GetArgumentsOfType<T>() where T : class
|
||||
{
|
||||
List<T> result = new List<T>();
|
||||
List<T> result = new();
|
||||
foreach (var methodParameter in this.Parameters)
|
||||
{
|
||||
if ((methodParameter.Bindings & MethodParameterBindings.In) != MethodParameterBindings.In)
|
||||
|
||||
@@ -237,7 +237,7 @@ function __cmdletization_BindCommonParameters
|
||||
private static string GetCmdletAttributes(CommonCmdletMetadata cmdletMetadata)
|
||||
{
|
||||
// Generate the script for the Alias and Obsolete Attribute if any is declared in CDXML
|
||||
StringBuilder attributes = new StringBuilder(150);
|
||||
StringBuilder attributes = new(150);
|
||||
if (cmdletMetadata.Aliases != null)
|
||||
{
|
||||
attributes.Append("[Alias('" + string.Join("','", cmdletMetadata.Aliases.Select(alias => CodeGeneration.EscapeSingleQuotedStringContent(alias))) + "')]");
|
||||
@@ -257,12 +257,12 @@ function __cmdletization_BindCommonParameters
|
||||
|
||||
private Dictionary<string, ParameterMetadata> GetCommonParameters()
|
||||
{
|
||||
Dictionary<string, ParameterMetadata> commonParameters = new Dictionary<string, ParameterMetadata>(StringComparer.OrdinalIgnoreCase);
|
||||
Dictionary<string, ParameterMetadata> commonParameters = new(StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
InternalParameterMetadata internalParameterMetadata = new InternalParameterMetadata(_objectModelWrapper, false);
|
||||
InternalParameterMetadata internalParameterMetadata = new(_objectModelWrapper, false);
|
||||
foreach (CompiledCommandParameter compiledCommandParameter in internalParameterMetadata.BindableParameters.Values)
|
||||
{
|
||||
ParameterMetadata parameterMetadata = new ParameterMetadata(compiledCommandParameter);
|
||||
ParameterMetadata parameterMetadata = new(compiledCommandParameter);
|
||||
foreach (ParameterSetMetadata psetMetadata in parameterMetadata.ParameterSets.Values)
|
||||
{
|
||||
if (psetMetadata.ValueFromPipeline)
|
||||
@@ -335,7 +335,7 @@ function __cmdletization_BindCommonParameters
|
||||
|
||||
private static List<string> GetCommonParameterSets(Dictionary<string, ParameterMetadata> commonParameters)
|
||||
{
|
||||
Dictionary<string, object> parameterSetNames = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
|
||||
Dictionary<string, object> parameterSetNames = new(StringComparer.OrdinalIgnoreCase);
|
||||
foreach (ParameterMetadata parameter in commonParameters.Values)
|
||||
{
|
||||
foreach (string parameterSetName in parameter.ParameterSets.Keys)
|
||||
@@ -352,7 +352,7 @@ function __cmdletization_BindCommonParameters
|
||||
parameterSetNames.Add(ParameterAttribute.AllParameterSets, null);
|
||||
}
|
||||
|
||||
List<string> result = new List<string>(parameterSetNames.Keys);
|
||||
List<string> result = new(parameterSetNames.Keys);
|
||||
result.Sort(StringComparer.Ordinal); // to have a deterministic order of parameter sets (also means that Ordinal instead of OrdinalIgnoreCase is ok)
|
||||
return result;
|
||||
}
|
||||
@@ -365,7 +365,7 @@ function __cmdletization_BindCommonParameters
|
||||
|
||||
private List<string> GetMethodParameterSets(StaticCmdletMetadata staticCmdlet)
|
||||
{
|
||||
Dictionary<string, object> parameterSetNames = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
|
||||
Dictionary<string, object> parameterSetNames = new(StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
foreach (StaticMethodMetadata method in staticCmdlet.Method)
|
||||
{
|
||||
@@ -386,7 +386,7 @@ function __cmdletization_BindCommonParameters
|
||||
return new List<string>(parameterSetNames.Keys);
|
||||
}
|
||||
|
||||
private Dictionary<CommonMethodMetadata, int> _staticMethodMetadataToUniqueId = new Dictionary<CommonMethodMetadata, int>();
|
||||
private Dictionary<CommonMethodMetadata, int> _staticMethodMetadataToUniqueId = new();
|
||||
|
||||
private string GetMethodParameterSet(CommonMethodMetadata methodMetadata)
|
||||
{
|
||||
@@ -404,7 +404,7 @@ function __cmdletization_BindCommonParameters
|
||||
|
||||
private List<string> GetMethodParameterSets(InstanceCmdletMetadata instanceCmdlet)
|
||||
{
|
||||
Dictionary<string, object> parameterSetNames = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
|
||||
Dictionary<string, object> parameterSetNames = new(StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
InstanceMethodMetadata method = instanceCmdlet.Method;
|
||||
string parameterSetName = GetMethodParameterSet(method);
|
||||
@@ -436,7 +436,7 @@ function __cmdletization_BindCommonParameters
|
||||
|
||||
private List<string> GetQueryParameterSets(InstanceCmdletMetadata instanceCmdlet)
|
||||
{
|
||||
Dictionary<string, object> parameterSetNames = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
|
||||
Dictionary<string, object> parameterSetNames = new(StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
var parameters = new List<CmdletParameterMetadataForGetCmdletParameter>();
|
||||
bool anyQueryParameters = false;
|
||||
@@ -555,7 +555,7 @@ function __cmdletization_BindCommonParameters
|
||||
parameterName = objectModelParameterName;
|
||||
}
|
||||
|
||||
ParameterMetadata parameterMetadata = new ParameterMetadata(parameterName);
|
||||
ParameterMetadata parameterMetadata = new(parameterName);
|
||||
parameterMetadata.ParameterType = GetDotNetType(parameterTypeMetadata);
|
||||
if (typeof(PSCredential).Equals(parameterMetadata.ParameterType))
|
||||
{
|
||||
@@ -645,7 +645,7 @@ function __cmdletization_BindCommonParameters
|
||||
|
||||
if (parameterCmdletization.ValidateSet != null)
|
||||
{
|
||||
List<string> allowedValues = new List<string>();
|
||||
List<string> allowedValues = new();
|
||||
foreach (string allowedValue in parameterCmdletization.ValidateSet)
|
||||
{
|
||||
allowedValues.Add(allowedValue);
|
||||
@@ -803,9 +803,9 @@ function __cmdletization_BindCommonParameters
|
||||
confirmImpact = (System.Management.Automation.ConfirmImpact)(int)cmdletMetadata.ConfirmImpact;
|
||||
}
|
||||
|
||||
Dictionary<string, ParameterMetadata> parameters = new Dictionary<string, ParameterMetadata>(StringComparer.OrdinalIgnoreCase);
|
||||
Dictionary<string, ParameterMetadata> parameters = new(StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
CommandMetadata commandMetadata = new CommandMetadata(
|
||||
CommandMetadata commandMetadata = new(
|
||||
name: this.GetCmdletName(cmdletMetadata),
|
||||
commandType: CommandTypes.Cmdlet,
|
||||
isProxyForCmdlet: true,
|
||||
@@ -829,7 +829,7 @@ function __cmdletization_BindCommonParameters
|
||||
{
|
||||
Dbg.Assert(name != null, "Caller should verify name != null");
|
||||
|
||||
StringBuilder result = new StringBuilder(name.Length);
|
||||
StringBuilder result = new(name.Length);
|
||||
foreach (char c in name)
|
||||
{
|
||||
if (("\"'`$#".IndexOf(c) == (-1)) &&
|
||||
@@ -850,10 +850,10 @@ function __cmdletization_BindCommonParameters
|
||||
|
||||
if (x.Length == 1)
|
||||
{
|
||||
List<List<string>> result = new List<List<string>>();
|
||||
List<List<string>> result = new();
|
||||
foreach (string s in x[0])
|
||||
{
|
||||
List<string> subresult = new List<string>();
|
||||
List<string> subresult = new();
|
||||
subresult.Add(s);
|
||||
result.Add(subresult);
|
||||
}
|
||||
@@ -866,12 +866,12 @@ function __cmdletization_BindCommonParameters
|
||||
Array.Copy(x, 0, smallX, 0, smallX.Length);
|
||||
List<List<string>> smallResult = GetCombinations(smallX);
|
||||
|
||||
List<List<string>> result = new List<List<string>>();
|
||||
List<List<string>> result = new();
|
||||
foreach (List<string> smallSubresult in smallResult)
|
||||
{
|
||||
foreach (string s in x[x.Length - 1])
|
||||
{
|
||||
List<string> newsubresult = new List<string>(smallSubresult);
|
||||
List<string> newsubresult = new(smallSubresult);
|
||||
newsubresult.Add(s);
|
||||
result.Add(newsubresult);
|
||||
}
|
||||
@@ -941,7 +941,7 @@ function __cmdletization_BindCommonParameters
|
||||
|
||||
foreach (ParameterMetadata parameter in parameters.Values)
|
||||
{
|
||||
List<KeyValuePair<string, ParameterSetMetadata>> oldParameterSets = new List<KeyValuePair<string, ParameterSetMetadata>>(parameter.ParameterSets);
|
||||
List<KeyValuePair<string, ParameterSetMetadata>> oldParameterSets = new(parameter.ParameterSets);
|
||||
|
||||
parameter.ParameterSets.Clear();
|
||||
foreach (KeyValuePair<string, ParameterSetMetadata> oldParameterSet in oldParameterSets)
|
||||
@@ -964,7 +964,7 @@ function __cmdletization_BindCommonParameters
|
||||
string parameterSetNameTemplate, // {0} is the original parameter set, other ones are taken from the otherParameterSets array
|
||||
params IEnumerable<string>[] otherParameterSets)
|
||||
{
|
||||
List<string> result = new List<string>();
|
||||
List<string> result = new();
|
||||
|
||||
List<List<string>> combinations = GetCombinations(otherParameterSets);
|
||||
foreach (List<string> combination in combinations)
|
||||
@@ -1139,8 +1139,8 @@ function __cmdletization_BindCommonParameters
|
||||
out string outputTypeAttributeDeclaration)
|
||||
{
|
||||
methodParameters = new Dictionary<string, ParameterMetadata>(StringComparer.OrdinalIgnoreCase);
|
||||
StringBuilder outputTypeAttributeDeclarationBuilder = new StringBuilder();
|
||||
StringWriter output = new StringWriter(CultureInfo.InvariantCulture);
|
||||
StringBuilder outputTypeAttributeDeclarationBuilder = new();
|
||||
StringWriter output = new(CultureInfo.InvariantCulture);
|
||||
|
||||
output.WriteLine(" $__cmdletization_methodParameters = [System.Collections.Generic.List[Microsoft.PowerShell.Cmdletization.MethodParameter]]::new()");
|
||||
output.WriteLine();
|
||||
@@ -1170,8 +1170,8 @@ function __cmdletization_BindCommonParameters
|
||||
output.WriteLine(") -contains $_ } {");
|
||||
}
|
||||
|
||||
List<Type> typesOfOutParameters = new List<Type>();
|
||||
List<string> etsTypesOfOutParameters = new List<string>();
|
||||
List<Type> typesOfOutParameters = new();
|
||||
List<string> etsTypesOfOutParameters = new();
|
||||
if (method.Parameters != null)
|
||||
{
|
||||
foreach (StaticMethodParameterMetadata methodParameter in method.Parameters)
|
||||
@@ -1303,7 +1303,7 @@ function __cmdletization_BindCommonParameters
|
||||
{
|
||||
methodParameters = new Dictionary<string, ParameterMetadata>(StringComparer.OrdinalIgnoreCase);
|
||||
outputTypeAttributeDeclaration = string.Empty;
|
||||
StringWriter output = new StringWriter(CultureInfo.InvariantCulture);
|
||||
StringWriter output = new(CultureInfo.InvariantCulture);
|
||||
|
||||
output.WriteLine(" $__cmdletization_methodParameters = [System.Collections.Generic.List[Microsoft.PowerShell.Cmdletization.MethodParameter]]::new()");
|
||||
output.WriteLine(" switch -exact ($PSCmdlet.ParameterSetName) { ");
|
||||
@@ -1320,8 +1320,8 @@ function __cmdletization_BindCommonParameters
|
||||
|
||||
output.WriteLine(") -contains $_ } {");
|
||||
|
||||
List<Type> typesOfOutParameters = new List<Type>();
|
||||
List<string> etsTypesOfOutParameters = new List<string>();
|
||||
List<Type> typesOfOutParameters = new();
|
||||
List<string> etsTypesOfOutParameters = new();
|
||||
if (method.Parameters != null)
|
||||
{
|
||||
foreach (InstanceMethodParameterMetadata methodParameter in method.Parameters)
|
||||
@@ -1615,7 +1615,7 @@ function __cmdletization_BindCommonParameters
|
||||
out Dictionary<string, ParameterMetadata> queryParameters)
|
||||
{
|
||||
queryParameters = new Dictionary<string, ParameterMetadata>(StringComparer.OrdinalIgnoreCase);
|
||||
StringWriter output = new StringWriter(CultureInfo.InvariantCulture);
|
||||
StringWriter output = new(CultureInfo.InvariantCulture);
|
||||
|
||||
output.WriteLine(" $__cmdletization_queryBuilder = $__cmdletization_objectModelWrapper.GetQueryBuilder()");
|
||||
|
||||
@@ -1725,7 +1725,7 @@ function __cmdletization_BindCommonParameters
|
||||
|
||||
if (instanceCmdlet != null)
|
||||
{
|
||||
ParameterMetadata inputObjectParameter = new ParameterMetadata("InputObject", _objectInstanceType.MakeArrayType());
|
||||
ParameterMetadata inputObjectParameter = new("InputObject", _objectInstanceType.MakeArrayType());
|
||||
|
||||
ParameterSetMetadata.ParameterFlags inputObjectFlags = ParameterSetMetadata.ParameterFlags.ValueFromPipeline;
|
||||
if (queryParameters.Count > 0)
|
||||
@@ -1761,10 +1761,10 @@ function __cmdletization_BindCommonParameters
|
||||
|
||||
inputObjectParameter.Attributes.Add(new ValidateNotNullAttribute());
|
||||
inputObjectParameter.ParameterSets.Clear();
|
||||
ParameterSetMetadata inputObjectPSet = new ParameterSetMetadata(
|
||||
ParameterSetMetadata inputObjectPSet = new(
|
||||
int.MinValue, // non-positional
|
||||
inputObjectFlags,
|
||||
null); // no help message
|
||||
helpMessage: null);
|
||||
inputObjectParameter.ParameterSets.Add(ScriptWriter.InputObjectQueryParameterSetName, inputObjectPSet);
|
||||
queryParameters.Add(inputObjectParameter.Name, inputObjectParameter);
|
||||
}
|
||||
@@ -1859,7 +1859,7 @@ Microsoft.PowerShell.Core\Export-ModuleMember -Function '{1}' -Alias '*'
|
||||
|
||||
private string GetHelpDirectiveForExternalHelp()
|
||||
{
|
||||
StringBuilder output = new StringBuilder();
|
||||
StringBuilder output = new();
|
||||
|
||||
if ((_generationOptions & GenerationOptions.HelpXml) == GenerationOptions.HelpXml)
|
||||
{
|
||||
@@ -1948,9 +1948,9 @@ Microsoft.PowerShell.Core\Export-ModuleMember -Function '{1}' -Alias '*'
|
||||
|
||||
if (!outParametersArePresent)
|
||||
{
|
||||
ParameterMetadata passThruParameter = new ParameterMetadata("PassThru", typeof(SwitchParameter));
|
||||
ParameterMetadata passThruParameter = new("PassThru", typeof(SwitchParameter));
|
||||
passThruParameter.ParameterSets.Clear();
|
||||
ParameterSetMetadata passThruPSet = new ParameterSetMetadata(int.MinValue, 0, null);
|
||||
ParameterSetMetadata passThruPSet = new(int.MinValue, 0, null);
|
||||
passThruParameter.ParameterSets.Add(ParameterAttribute.AllParameterSets, passThruPSet);
|
||||
|
||||
commonParameters.Add(passThruParameter.Name, passThruParameter);
|
||||
@@ -2017,7 +2017,7 @@ Microsoft.PowerShell.Core\Export-ModuleMember -Function '{1}' -Alias '*'
|
||||
|
||||
private string GetOutputAttributeForGetCmdlet()
|
||||
{
|
||||
StringBuilder result = new StringBuilder();
|
||||
StringBuilder result = new();
|
||||
result.AppendFormat(
|
||||
CultureInfo.InvariantCulture,
|
||||
"[OutputType([{0}])]",
|
||||
@@ -2055,7 +2055,7 @@ Microsoft.PowerShell.Core\Export-ModuleMember -Function '{1}' -Alias '*'
|
||||
{
|
||||
Dictionary<string, ParameterMetadata> commonParameters = this.GetCommonParameters();
|
||||
List<string> commonParameterSets = GetCommonParameterSets(commonParameters);
|
||||
List<string> methodParameterSets = new List<string>();
|
||||
List<string> methodParameterSets = new();
|
||||
methodParameterSets.Add(string.Empty);
|
||||
List<string> queryParameterSets = GetQueryParameterSets(null);
|
||||
|
||||
@@ -2100,7 +2100,7 @@ Microsoft.PowerShell.Core\Export-ModuleMember -Function '{1}' -Alias '*'
|
||||
/* 1 */ CodeGeneration.EscapeSingleQuotedStringContent(commandMetadata.Name));
|
||||
}
|
||||
|
||||
private static object s_enumCompilationLock = new object();
|
||||
private static object s_enumCompilationLock = new();
|
||||
|
||||
private static void CompileEnum(EnumMetadataEnum enumMetadata)
|
||||
{
|
||||
@@ -2176,11 +2176,11 @@ Microsoft.PowerShell.Core\Export-ModuleMember -Function '{1}' -Alias '*'
|
||||
moduleInfo.SetModuleType(ModuleType.Cim);
|
||||
moduleInfo.SetVersion(new Version(_cmdletizationMetadata.Class.Version));
|
||||
|
||||
Hashtable cmdletizationData = new Hashtable(StringComparer.OrdinalIgnoreCase);
|
||||
Hashtable cmdletizationData = new(StringComparer.OrdinalIgnoreCase);
|
||||
cmdletizationData.Add(PrivateDataKey_ClassName, _cmdletizationMetadata.Class.ClassName);
|
||||
cmdletizationData.Add(PrivateDataKey_ObjectModelWrapper, _objectModelWrapper);
|
||||
|
||||
Hashtable privateData = new Hashtable(StringComparer.OrdinalIgnoreCase);
|
||||
Hashtable privateData = new(StringComparer.OrdinalIgnoreCase);
|
||||
privateData.Add(PrivateDataKey_CmdletsOverObjects, cmdletizationData);
|
||||
moduleInfo.PrivateData = privateData;
|
||||
}
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@ namespace Microsoft.PowerShell.Cmdletization.Cim
|
||||
/// </remarks>
|
||||
internal class WildcardPatternToCimQueryParser : WildcardPatternParser
|
||||
{
|
||||
private readonly StringBuilder _result = new StringBuilder();
|
||||
private readonly StringBuilder _result = new();
|
||||
private bool _needClientSideFiltering;
|
||||
|
||||
protected override void AppendLiteralCharacter(char c)
|
||||
|
||||
Reference in new issue
Block a user