Skip to content

Fix IDE0090: Simplify new expression part 4.2 #14256

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 27, 2020
Merged

Fix IDE0090: Simplify new expression part 4.2 #14256

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
8 changes: 4 additions & 4 deletions ...l.Commands.Utility/commands/utility/WebCmdlet/Common/BasicHtmlWebResponseObject.Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public WebCmdletElementCollection InputFields
{
EnsureHtmlParser();

List<PSObject> parsedFields = new List<PSObject>();
List<PSObject> parsedFields = new();
MatchCollection fieldMatch = s_inputFieldRegex.Matches(Content);
foreach (Match field in fieldMatch)
{
Expand All @@ -113,7 +113,7 @@ public WebCmdletElementCollection Links
{
EnsureHtmlParser();

List<PSObject> parsedLinks = new List<PSObject>();
List<PSObject> parsedLinks = new();
MatchCollection linkMatch = s_linkRegex.Matches(Content);
foreach (Match link in linkMatch)
{
Expand All @@ -140,7 +140,7 @@ public WebCmdletElementCollection Images
{
EnsureHtmlParser();

List<PSObject> parsedImages = new List<PSObject>();
List<PSObject> parsedImages = new();
MatchCollection imageMatch = s_imageRegex.Matches(Content);
foreach (Match image in imageMatch)
{
Expand Down Expand Up @@ -186,7 +186,7 @@ protected void InitializeContent()

private PSObject CreateHtmlObject(string html, string tagName)
{
PSObject elementObject = new PSObject();
PSObject elementObject = new();

elementObject.Properties.Add(new PSNoteProperty("outerHTML", html));
elementObject.Properties.Add(new PSNoteProperty("tagName", tagName));
Expand Down
2 changes: 1 addition & 1 deletion ...oft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/ContentHelper.Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ internal static Encoding GetEncodingOrDefault(string characterSet)

internal static StringBuilder GetRawContentHeader(HttpResponseMessage response)
{
StringBuilder raw = new StringBuilder();
StringBuilder raw = new();

string protocol = WebResponseHelper.GetProtocol(response);
if (!string.IsNullOrEmpty(protocol))
Expand Down
4 changes: 2 additions & 2 deletions ...hell.Commands.Utility/commands/utility/WebCmdlet/Common/InvokeRestMethodCommand.Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ private bool TryProcessFeedStream(Stream responseStream)

if (isRssOrFeed)
{
XmlDocument workingDocument = new XmlDocument();
XmlDocument workingDocument = new();
// performing a Read() here to avoid rrechecking
// "rss" or "feed" items
reader.Read();
Expand Down Expand Up @@ -145,7 +145,7 @@ private bool TryProcessFeedStream(Stream responseStream)
// Mostly cribbed from Serialization.cs#GetXmlReaderSettingsForCliXml()
private XmlReaderSettings GetSecureXmlReaderSettings()
{
XmlReaderSettings xrs = new XmlReaderSettings();
XmlReaderSettings xrs = new();

xrs.CheckCharacters = false;
xrs.CloseInput = false;
Expand Down
34 changes: 17 additions & 17 deletions ...owerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,13 +606,13 @@ internal virtual void PrepareSession()

if (CertificateThumbprint != null)
{
X509Store store = new X509Store(StoreName.My, StoreLocation.CurrentUser);
X509Store store = new(StoreName.My, StoreLocation.CurrentUser);
store.Open(OpenFlags.ReadOnly | OpenFlags.OpenExistingOnly);
X509Certificate2Collection collection = (X509Certificate2Collection)store.Certificates;
X509Certificate2Collection tbCollection = (X509Certificate2Collection)collection.Find(X509FindType.FindByThumbprint, CertificateThumbprint, false);
if (tbCollection.Count == 0)
{
CryptographicException ex = new CryptographicException(WebCmdletStrings.ThumbprintNotFound);
CryptographicException ex = new(WebCmdletStrings.ThumbprintNotFound);
throw ex;
}

Expand All @@ -639,7 +639,7 @@ internal virtual void PrepareSession()

if (Proxy != null)
{
WebProxy webProxy = new WebProxy(Proxy);
WebProxy webProxy = new(Proxy);
webProxy.BypassProxyOnLocal = false;
if (ProxyCredential != null)
{
Expand Down Expand Up @@ -733,7 +733,7 @@ private Uri PrepareUri(Uri uri)
&& ((IsStandardMethodSet() && (Method == WebRequestMethod.Default || Method == WebRequestMethod.Get))
|| (IsCustomMethodSet() && CustomMethod.ToUpperInvariant() == "GET")))
{
UriBuilder uriBuilder = new UriBuilder(uri);
UriBuilder uriBuilder = new(uri);
if (uriBuilder.Query != null && uriBuilder.Query.Length > 1)
{
uriBuilder.Query = string.Concat(uriBuilder.Query.AsSpan().Slice(1), "&", FormatDictionary(bodyAsDictionary));
Expand Down Expand Up @@ -774,7 +774,7 @@ private string FormatDictionary(IDictionary content)
if (content == null)
throw new ArgumentNullException(nameof(content));

StringBuilder bodyBuilder = new StringBuilder();
StringBuilder bodyBuilder = new();
foreach (string key in content.Keys)
{
if (bodyBuilder.Length > 0)
Expand Down Expand Up @@ -984,7 +984,7 @@ private HttpMethod GetHttpMethod(WebRequestMethod method)
internal virtual HttpClient GetHttpClient(bool handleRedirect)
{
// By default the HttpClientHandler will automatically decompress GZip and Deflate content
HttpClientHandler handler = new HttpClientHandler();
HttpClientHandler handler = new();
handler.CookieContainer = WebSession.Cookies;

// set the credentials used by this request
Expand Down Expand Up @@ -1037,7 +1037,7 @@ internal virtual HttpClient GetHttpClient(bool handleRedirect)

handler.SslProtocols = (SslProtocols)SslProtocol;

HttpClient httpClient = new HttpClient(handler);
HttpClient httpClient = new(handler);

// check timeout setting (in seconds instead of milliseconds as in HttpWebRequest)
if (TimeoutSec == 0)
Expand Down Expand Up @@ -1284,7 +1284,7 @@ internal virtual void FillRequestStream(HttpRequestMessage request)
catch (FormatException ex)
{
var outerEx = new ValidationMetadataException(WebCmdletStrings.ContentTypeException, ex);
ErrorRecord er = new ErrorRecord(outerEx, "WebCmdletContentTypeException", ErrorCategory.InvalidArgument, ContentType);
ErrorRecord er = new(outerEx, "WebCmdletContentTypeException", ErrorCategory.InvalidArgument, ContentType);
ThrowTerminatingError(er);
}
}
Expand Down Expand Up @@ -1540,8 +1540,8 @@ protected override void ProcessRecord()
{
string message = string.Format(CultureInfo.CurrentCulture, WebCmdletStrings.ResponseStatusCodeFailure,
(int)response.StatusCode, response.ReasonPhrase);
HttpResponseException httpEx = new HttpResponseException(message, response);
ErrorRecord er = new ErrorRecord(httpEx, "WebCmdletWebResponseException", ErrorCategory.InvalidOperation, request);
HttpResponseException httpEx = new(message, response);
ErrorRecord er = new(httpEx, "WebCmdletWebResponseException", ErrorCategory.InvalidOperation, request);
string detailMsg = string.Empty;
StreamReader reader = null;
try
Expand Down Expand Up @@ -1588,15 +1588,15 @@ protected override void ProcessRecord()
response.StatusCode == HttpStatusCode.Moved ||
response.StatusCode == HttpStatusCode.MovedPermanently)
{
ErrorRecord er = new ErrorRecord(new InvalidOperationException(), "MaximumRedirectExceeded", ErrorCategory.InvalidOperation, request);
ErrorRecord er = new(new InvalidOperationException(), "MaximumRedirectExceeded", ErrorCategory.InvalidOperation, request);
er.ErrorDetails = new ErrorDetails(WebCmdletStrings.MaximumRedirectionCountExceeded);
WriteError(er);
}
}
}
catch (HttpRequestException ex)
{
ErrorRecord er = new ErrorRecord(ex, "WebCmdletWebResponseException", ErrorCategory.InvalidOperation, request);
ErrorRecord er = new(ex, "WebCmdletWebResponseException", ErrorCategory.InvalidOperation, request);
if (ex.InnerException != null)
{
er.ErrorDetails = new ErrorDetails(ex.InnerException.Message);
Expand All @@ -1622,12 +1622,12 @@ protected override void ProcessRecord()
}
catch (CryptographicException ex)
{
ErrorRecord er = new ErrorRecord(ex, "WebCmdletCertificateException", ErrorCategory.SecurityError, null);
ErrorRecord er = new(ex, "WebCmdletCertificateException", ErrorCategory.SecurityError, null);
ThrowTerminatingError(er);
}
catch (NotSupportedException ex)
{
ErrorRecord er = new ErrorRecord(ex, "WebCmdletIEDomNotSupportedException", ErrorCategory.NotImplemented, null);
ErrorRecord er = new(ex, "WebCmdletIEDomNotSupportedException", ErrorCategory.NotImplemented, null);
ThrowTerminatingError(er);
}
}
Expand Down Expand Up @@ -1707,7 +1707,7 @@ internal long SetRequestContent(HttpRequestMessage request, string content)
if (!SkipHeaderValidation)
{
var outerEx = new ValidationMetadataException(WebCmdletStrings.ContentTypeException, ex);
ErrorRecord er = new ErrorRecord(outerEx, "WebCmdletContentTypeException", ErrorCategory.InvalidArgument, ContentType);
ErrorRecord er = new(outerEx, "WebCmdletContentTypeException", ErrorCategory.InvalidArgument, ContentType);
ThrowTerminatingError(er);
}
}
Expand All @@ -1716,7 +1716,7 @@ internal long SetRequestContent(HttpRequestMessage request, string content)
if (!SkipHeaderValidation)
{
var outerEx = new ValidationMetadataException(WebCmdletStrings.ContentTypeException, ex);
ErrorRecord er = new ErrorRecord(outerEx, "WebCmdletContentTypeException", ErrorCategory.InvalidArgument, ContentType);
ErrorRecord er = new(outerEx, "WebCmdletContentTypeException", ErrorCategory.InvalidArgument, ContentType);
ThrowTerminatingError(er);
}
}
Expand Down Expand Up @@ -1846,7 +1846,7 @@ internal void ParseLinkHeader(HttpResponseMessage response, System.Uri requestUr
string rel = match.Groups["rel"].Value;
if (url != string.Empty && rel != string.Empty && !_relationLink.ContainsKey(rel))
{
Uri absoluteUri = new Uri(requestUri, url);
Uri absoluteUri = new(requestUri, url);
_relationLink.Add(rel, absoluteUri.AbsoluteUri);
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...icrosoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertFromJsonCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class ConvertFromJsonCommand : Cmdlet
/// <summary>
/// InputObjectBuffer buffers all InputObject contents available in the pipeline.
/// </summary>
private readonly List<string> _inputObjectBuffer = new List<string>();
private readonly List<string> _inputObjectBuffer = new();

/// <summary>
/// Returned data structure is a Hashtable instead a CustomPSObject.
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class ConvertToJsonCommand : PSCmdlet

private const int maxDepthAllowed = 100;

private readonly CancellationTokenSource _cancellationSource = new CancellationTokenSource();
private readonly CancellationTokenSource _cancellationSource = new();

/// <summary>
/// Gets or sets the Depth property.
Expand Down Expand Up @@ -93,7 +93,7 @@ protected override void BeginProcessing()
}
}

private readonly List<object> _inputObjects = new List<object>();
private readonly List<object> _inputObjects = new();

/// <summary>
/// Caching the input objects for the command.
Expand Down
8 changes: 4 additions & 4 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ private static ICollection<object> PopulateFromJArray(JArray list, out ErrorReco
private static Hashtable PopulateHashTableFromJDictionary(JObject entries, out ErrorRecord error)
{
error = null;
Hashtable result = new Hashtable(entries.Count);
Hashtable result = new(entries.Count);
foreach (var entry in entries)
{
// Case sensitive duplicates should normally not occur since JsonConvert.DeserializeObject
Expand Down Expand Up @@ -708,7 +708,7 @@ private static void AppendPsProperties(PSObject psObj, IDictionary receiver, int
/// </summary>
private static object ProcessDictionary(IDictionary dict, int depth, in ConvertToJsonContext context)
{
Dictionary<string, object> result = new Dictionary<string, object>(dict.Count);
Dictionary<string, object> result = new(dict.Count);

foreach (DictionaryEntry entry in dict)
{
Expand Down Expand Up @@ -745,7 +745,7 @@ private static object ProcessDictionary(IDictionary dict, int depth, in ConvertT
/// </summary>
private static object ProcessEnumerable(IEnumerable enumerable, int depth, in ConvertToJsonContext context)
{
List<object> result = new List<object>();
List<object> result = new();

foreach (object o in enumerable)
{
Expand All @@ -765,7 +765,7 @@ private static object ProcessEnumerable(IEnumerable enumerable, int depth, in Co
/// </summary>
private static object ProcessCustomObject<T>(object o, int depth, in ConvertToJsonContext context)
{
Dictionary<string, object> result = new Dictionary<string, object>();
Dictionary<string, object> result = new();
Type t = o.GetType();

foreach (FieldInfo info in t.GetFields(BindingFlags.Public | BindingFlags.Instance))
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/PSUserAgent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,9 @@ internal static string PlatformName
if (s_windowsUserAgent == null)
{
// find the version in the windows operating system description
Regex pattern = new Regex(@"\d+(\.\d+)+");
Regex pattern = new(@"\d+(\.\d+)+");
string versionText = pattern.Match(OS).Value;
Version windowsPlatformversion = new Version(versionText);
Version windowsPlatformversion = new(versionText);
s_windowsUserAgent = $"Windows NT {windowsPlatformversion.Major}.{windowsPlatformversion.Minor}";
}

Expand Down
10 changes: 5 additions & 5 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/StreamHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ private void Initialize()
{
long totalLength = 0;
byte[] buffer = new byte[StreamHelper.ChunkSize];
ProgressRecord record = new ProgressRecord(StreamHelper.ActivityId, WebCmdletStrings.ReadResponseProgressActivity, "statusDescriptionPlaceholder");
ProgressRecord record = new(StreamHelper.ActivityId, WebCmdletStrings.ReadResponseProgressActivity, "statusDescriptionPlaceholder");
for (int read = 1; read > 0; totalLength += read)
{
if (_ownerCmdlet != null)
Expand Down Expand Up @@ -284,7 +284,7 @@ internal static void WriteToStream(Stream input, Stream output, PSCmdlet cmdlet,

Task copyTask = input.CopyToAsync(output, cancellationToken);

ProgressRecord record = new ProgressRecord(
ProgressRecord record = new(
ActivityId,
WebCmdletStrings.WriteRequestProgressActivity,
WebCmdletStrings.WriteRequestProgressStatus);
Expand Down Expand Up @@ -322,13 +322,13 @@ internal static void SaveStreamToFile(Stream stream, string filePath, PSCmdlet c
{
// If the web cmdlet should resume, append the file instead of overwriting.
FileMode fileMode = cmdlet is WebRequestPSCmdlet webCmdlet && webCmdlet.ShouldResume ? FileMode.Append : FileMode.Create;
using FileStream output = new FileStream(filePath, fileMode, FileAccess.Write, FileShare.Read);
using FileStream output = new(filePath, fileMode, FileAccess.Write, FileShare.Read);
WriteToStream(stream, output, cmdlet, cancellationToken);
}

private static string StreamToString(Stream stream, Encoding encoding)
{
StringBuilder result = new StringBuilder(capacity: ChunkSize);
StringBuilder result = new(capacity: ChunkSize);
Decoder decoder = encoding.GetDecoder();

int useBufferSize = 64;
Expand Down Expand Up @@ -410,7 +410,7 @@ internal static bool TryGetEncoding(string characterSet, out Encoding encoding)
return result;
}

private static readonly Regex s_metaexp = new Regex(
private static readonly Regex s_metaexp = new(
@"<meta\s.*[^.><]*charset\s*=\s*[""'\n]?(?<charset>[A-Za-z].[^\s""'\n<>]*)[\s""'\n>]",
RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.ExplicitCapture | RegexOptions.CultureInvariant | RegexOptions.IgnoreCase
);
Expand Down