Skip to content

Fix IDE0090: Simplify new expression part 4.1 #14255

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
iSazonov merged 1 commit into from
Nov 26, 2020
Merged

Fix IDE0090: Simplify new expression part 4.1 #14255

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
6 changes: 3 additions & 3 deletions ...ft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/HeaderInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Microsoft.PowerShell.Commands
{
internal class HeaderInfo
{
private readonly List<ColumnInfo> _columns = new List<ColumnInfo>();
private readonly List<ColumnInfo> _columns = new();

internal void AddColumn(ColumnInfo col)
{
Expand All @@ -18,7 +18,7 @@ internal void AddColumn(ColumnInfo col)

internal PSObject AddColumnsToWindow(OutWindowProxy windowProxy, PSObject liveObject)
{
PSObject staleObject = new PSObject();
PSObject staleObject = new();

// Initiate arrays to be of the same size.
int count = _columns.Count;
Expand Down Expand Up @@ -47,7 +47,7 @@ internal PSObject AddColumnsToWindow(OutWindowProxy windowProxy, PSObject liveOb

internal PSObject CreateStalePSObject(PSObject liveObject)
{
PSObject staleObject = new PSObject();
PSObject staleObject = new();
foreach (ColumnInfo column in _columns)
{
// Add a property to the stale PSObject.
Expand Down
8 changes: 4 additions & 4 deletions ...Shell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutGridViewCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ protected override void StopProcessing()
/// <param name="liveObject">PSObject to be converted to a string.</param>
internal string ConvertToString(PSObject liveObject)
{
StringFormatError formatErrorObject = new StringFormatError();
StringFormatError formatErrorObject = new();
string smartToString = PSObjectHelper.SmartToString(liveObject,
_expressionFactory,
InnerFormatShapeCommand.FormatEnumerationLimit(),
Expand Down Expand Up @@ -265,7 +265,7 @@ baseObject is PSReference ||
baseObject is FormatInfoData ||
baseObject is PSObject)
{
ErrorRecord error = new ErrorRecord(
ErrorRecord error = new(
new FormatException(StringUtil.Format(FormatAndOut_out_gridview.DataNotQualifiedForGridView)),
DataNotQualifiedForGridView,
ErrorCategory.InvalidType,
Expand All @@ -289,7 +289,7 @@ baseObject is FormatInfoData ||
Exception exception = _windowProxy.GetLastException();
if (exception != null)
{
ErrorRecord error = new ErrorRecord(
ErrorRecord error = new(
exception,
"ManagementListInvocationException",
ErrorCategory.OperationStopped,
Expand Down Expand Up @@ -357,7 +357,7 @@ internal class NonscalarTypeHeader : GridHeader
internal NonscalarTypeHeader(OutGridViewCommand parentCmd, PSObject input) : base(parentCmd)
{
// Prepare a table view.
TableView tableView = new TableView();
TableView tableView = new();
tableView.Initialize(parentCmd._expressionFactory, parentCmd._typeInfoDataBase);

// Request a view definition from the type database.
Expand Down
12 changes: 6 additions & 6 deletions ...oft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/TableView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ internal void Initialize(PSPropertyExpressionFactory expressionFactory,
_typeInfoDatabase = db;

// Initialize Format Error Manager.
FormatErrorPolicy formatErrorPolicy = new FormatErrorPolicy();
FormatErrorPolicy formatErrorPolicy = new();

formatErrorPolicy.ShowErrorsAsMessages = _typeInfoDatabase.defaultSettingsSection.formatErrorPolicy.ShowErrorsAsMessages;
formatErrorPolicy.ShowErrorsInFormattedOutput = _typeInfoDatabase.defaultSettingsSection.formatErrorPolicy.ShowErrorsInFormattedOutput;
Expand All @@ -35,7 +35,7 @@ internal void Initialize(PSPropertyExpressionFactory expressionFactory,

internal HeaderInfo GenerateHeaderInfo(PSObject input, TableControlBody tableBody, OutGridViewCommand parentCmdlet)
{
HeaderInfo headerInfo = new HeaderInfo();
HeaderInfo headerInfo = new();

// This verification is needed because the database returns "LastWriteTime" value for file system objects
// as strings and it is used to detect this situation and use the actual field value.
Expand Down Expand Up @@ -124,7 +124,7 @@ internal HeaderInfo GenerateHeaderInfo(PSObject input, TableControlBody tableBod

internal HeaderInfo GenerateHeaderInfo(PSObject input, OutGridViewCommand parentCmdlet)
{
HeaderInfo headerInfo = new HeaderInfo();
HeaderInfo headerInfo = new();
List<MshResolvedExpressionParameterAssociation> activeAssociationList;

// Get properties from the default property set of the object
Expand Down Expand Up @@ -201,7 +201,7 @@ private void FilterActiveAssociationList(List<MshResolvedExpressionParameterAsso

if (activeAssociationList.Count > nMax)
{
List<MshResolvedExpressionParameterAssociation> tmp = new List<MshResolvedExpressionParameterAssociation>(activeAssociationList);
List<MshResolvedExpressionParameterAssociation> tmp = new(activeAssociationList);
activeAssociationList.Clear();
for (int k = 0; k < nMax; k++)
activeAssociationList.Add(tmp[k]);
Expand All @@ -222,7 +222,7 @@ private List<TableRowItemDefinition> GetActiveTableRowDefinition(TableControlBod
TableRowDefinition matchingRowDefinition = null;

var typeNames = so.InternalTypeNames;
TypeMatch match = new TypeMatch(_expressionFactory, _typeInfoDatabase, typeNames);
TypeMatch match = new(_expressionFactory, _typeInfoDatabase, typeNames);

foreach (TableRowDefinition x in tableBody.optionalDefinitionList)
{
Expand Down Expand Up @@ -268,7 +268,7 @@ private List<TableRowItemDefinition> GetActiveTableRowDefinition(TableControlBod
}

// we have an override, we need to compute the merge of the active cells
List<TableRowItemDefinition> activeRowItemDefinitionList = new List<TableRowItemDefinition>();
List<TableRowItemDefinition> activeRowItemDefinitionList = new();
int col = 0;
foreach (TableRowItemDefinition rowItem in matchingRowDefinition.rowItemDefinitionList)
{
Expand Down
2 changes: 1 addition & 1 deletion ...rShell.Commands.Utility/commands/utility/FormatAndOutput/common/WriteFormatDataCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public string LiteralPath

private bool _isLiteralPath = false;

private readonly List<ExtendedTypeDefinition> _typeDefinitions = new List<ExtendedTypeDefinition>();
private readonly List<ExtendedTypeDefinition> _typeDefinitions = new();

private bool _force;

Expand Down
14 changes: 7 additions & 7 deletions ...oft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-hex/Format-Hex.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public sealed class FormatHex : PSCmdlet
/// For cases where a homogenous collection of bytes or other items are directly piped in, we collect all the
/// bytes in a List&lt;byte&gt; and then output the formatted result all at once in EndProcessing().
/// </summary>
private readonly List<byte> _inputBuffer = new List<byte>();
private readonly List<byte> _inputBuffer = new();

/// <summary>
/// Expect to group <see cref="InputObject"/>s by default. When receiving input that should not be grouped,
Expand Down Expand Up @@ -153,12 +153,12 @@ protected override void EndProcessing()
/// <returns></returns>
private List<string> ResolvePaths(string[] path, bool literalPath)
{
List<string> pathsToProcess = new List<string>();
List<string> pathsToProcess = new();
ProviderInfo provider = null;

foreach (string currentPath in path)
{
List<string> newPaths = new List<string>();
List<string> newPaths = new();

if (literalPath)
{
Expand All @@ -174,7 +174,7 @@ private List<string> ResolvePaths(string[] path, bool literalPath)
{
if (!WildcardPattern.ContainsWildcardCharacters(currentPath))
{
ErrorRecord errorRecord = new ErrorRecord(e, "FileNotFound", ErrorCategory.ObjectNotFound, path);
ErrorRecord errorRecord = new(e, "FileNotFound", ErrorCategory.ObjectNotFound, path);
WriteError(errorRecord);
continue;
}
Expand All @@ -185,7 +185,7 @@ private List<string> ResolvePaths(string[] path, bool literalPath)
{
// Write a non-terminating error message indicating that path specified is not supported.
string errorMessage = StringUtil.Format(UtilityCommonStrings.FormatHexOnlySupportsFileSystemPaths, currentPath);
ErrorRecord errorRecord = new ErrorRecord(
ErrorRecord errorRecord = new(
new ArgumentException(errorMessage),
"FormatHexOnlySupportsFileSystemPaths",
ErrorCategory.InvalidArgument,
Expand Down Expand Up @@ -293,7 +293,7 @@ private void ProcessString(string originalString)
}
}

private static readonly Random _idGenerator = new Random();
private static readonly Random _idGenerator = new();

private static string GetGroupLabel(Type inputType)
=> string.Format("{0} ({1}) <{2:X8}>", inputType.Name, inputType.FullName, _idGenerator.Next());
Expand Down Expand Up @@ -370,7 +370,7 @@ private void ProcessInputObjects(PSObject inputObject)
else
{
string errorMessage = StringUtil.Format(UtilityCommonStrings.FormatHexTypeNotSupported, obj.GetType());
ErrorRecord errorRecord = new ErrorRecord(
ErrorRecord errorRecord = new(
new ArgumentException(errorMessage),
"FormatHexTypeNotSupported",
ErrorCategory.InvalidArgument,
Expand Down
8 changes: 4 additions & 4 deletions ...werShell.Commands.Utility/commands/utility/FormatAndOutput/format-object/Format-Object.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ public int Depth

internal override FormattingCommandLineParameters GetCommandLineParameters()
{
FormattingCommandLineParameters parameters = new FormattingCommandLineParameters();
FormattingCommandLineParameters parameters = new();

if (_props != null)
{
ParameterProcessor processor = new ParameterProcessor(new FormatObjectParameterDefinition());
TerminatingErrorContext invocationContext = new TerminatingErrorContext(this);
ParameterProcessor processor = new(new FormatObjectParameterDefinition());
TerminatingErrorContext invocationContext = new(this);
parameters.mshParameterList = processor.ProcessParameters(_props, invocationContext);
}

Expand All @@ -86,7 +86,7 @@ internal override FormattingCommandLineParameters GetCommandLineParameters()

parameters.expansion = ProcessExpandParameter();

ComplexSpecificParameters csp = new ComplexSpecificParameters();
ComplexSpecificParameters csp = new();
csp.maxDepth = _depth;
parameters.shapeParameters = csp;

Expand Down
10 changes: 5 additions & 5 deletions ...t.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-wide/Format-Wide.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ public int Column

internal override FormattingCommandLineParameters GetCommandLineParameters()
{
FormattingCommandLineParameters parameters = new FormattingCommandLineParameters();
FormattingCommandLineParameters parameters = new();

if (_prop != null)
{
ParameterProcessor processor = new ParameterProcessor(new FormatWideParameterDefinition());
TerminatingErrorContext invocationContext = new TerminatingErrorContext(this);
ParameterProcessor processor = new(new FormatWideParameterDefinition());
TerminatingErrorContext invocationContext = new(this);
parameters.mshParameterList = processor.ProcessParameters(new object[] { _prop }, invocationContext);
}

Expand All @@ -110,7 +110,7 @@ internal override FormattingCommandLineParameters GetCommandLineParameters()
// the user specified -autosize:true AND a column number
string msg = StringUtil.Format(FormatAndOut_format_xxx.CannotSpecifyAutosizeAndColumnsError);

ErrorRecord errorRecord = new ErrorRecord(
ErrorRecord errorRecord = new(
new InvalidDataException(),
"FormatCannotSpecifyAutosizeAndColumns",
ErrorCategory.InvalidArgument,
Expand All @@ -133,7 +133,7 @@ internal override FormattingCommandLineParameters GetCommandLineParameters()
if (_autosize.HasValue)
parameters.autosize = _autosize.Value;

WideSpecificParameters wideSpecific = new WideSpecificParameters();
WideSpecificParameters wideSpecific = new();
parameters.shapeParameters = wideSpecific;
if (_column.HasValue)
{
Expand Down
2 changes: 1 addition & 1 deletion ...crosoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-file/Out-File.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ private LineOutput InstantiateLineOutputInterface()
}

// use the stream writer to create and initialize the Line Output writer
TextWriterLineOutput twlo = new TextWriterLineOutput(_sw, computedWidth, _suppressNewline);
TextWriterLineOutput twlo = new(_sw, computedWidth, _suppressNewline);

// finally have the ILineOutput interface extracted
return (LineOutput)twlo;
Expand Down
2 changes: 1 addition & 1 deletion ...t.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-printer/Out-Printer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ protected override void BeginProcessing()
/// </summary>
private LineOutput InstantiateLineOutputInterface()
{
PrinterLineOutput printOutput = new PrinterLineOutput(_printerName);
PrinterLineOutput printOutput = new(_printerName);
return (LineOutput)printOutput;
}
}
Expand Down
8 changes: 4 additions & 4 deletions ...rShell.Commands.Utility/commands/utility/FormatAndOutput/out-printer/PrinterLineOutput.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ internal PrinterLineOutput(string printerName)
_printerName = printerName;

// instantiate the helper to do the line processing when LineOutput.WriteXXX() is called
WriteLineHelper.WriteCallback wl = new WriteLineHelper.WriteCallback(this.OnWriteLine);
WriteLineHelper.WriteCallback w = new WriteLineHelper.WriteCallback(this.OnWrite);
WriteLineHelper.WriteCallback wl = new(this.OnWriteLine);
WriteLineHelper.WriteCallback w = new(this.OnWrite);

_writeLineHelper = new WriteLineHelper(true, wl, w, this.DisplayCells);
}
Expand Down Expand Up @@ -123,7 +123,7 @@ private void DoPrint()
try
{
// create a new print document object and set the printer name, if available
PrintDocument pd = new PrintDocument();
PrintDocument pd = new();

if (!string.IsNullOrEmpty(_printerName))
{
Expand Down Expand Up @@ -315,7 +315,7 @@ private void pd_PrintPage(object sender, PrintPageEventArgs ev)
/// <summary>
/// Text lines ready to print (after output cache playback).
/// </summary>
private readonly Queue<string> _lines = new Queue<string>();
private readonly Queue<string> _lines = new();

/// <summary>
/// Cached font object.
Expand Down
6 changes: 3 additions & 3 deletions ...oft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-string/Out-String.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ protected override void BeginProcessing()
private LineOutput InstantiateLineOutputInterface()
{
// set up the streaming text writer
StreamingTextWriter.WriteLineCallback callback = new StreamingTextWriter.WriteLineCallback(this.OnWriteLine);
StreamingTextWriter.WriteLineCallback callback = new(this.OnWriteLine);

_writer = new StreamingTextWriter(callback, Host.CurrentCulture);

Expand All @@ -103,7 +103,7 @@ private LineOutput InstantiateLineOutputInterface()
}

// use it to create and initialize the Line Output writer
TextWriterLineOutput twlo = new TextWriterLineOutput(_writer, computedWidth);
TextWriterLineOutput twlo = new(_writer, computedWidth);

// finally have the LineOutput interface extracted
return (LineOutput)twlo;
Expand Down Expand Up @@ -164,6 +164,6 @@ protected override void EndProcessing()
/// <summary>
/// Buffer used when buffering until the end.
/// </summary>
private readonly StringBuilder _buffer = new StringBuilder();
private readonly StringBuilder _buffer = new();
}
}