Fix IDE0090: Simplify new expression part 4.3

xtqqczze · xtqqczze · commit bcdc71e6d47b · 2020-11-25T08:56:55.000Z
`src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/` Contributes to PowerShell#14202. https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0090
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/MshHostTraceListener.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/MshHostTraceListener.cs
@@ -87,7 +87,7 @@ public override void Write(string output)
             }
         }
 
-        private readonly StringBuilder _cachedWrite = new StringBuilder();
+        private readonly StringBuilder _cachedWrite = new();
 
         /// <summary>
         /// Sends the given output string to the host for processing.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceCommandBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceCommandBase.cs
@@ -56,7 +56,7 @@ internal Collection<PSTraceSource> GetMatchingTraceSource(
         {
             notMatched = new Collection<string>();
 
-            Collection<PSTraceSource> results = new Collection<PSTraceSource>();
+            Collection<PSTraceSource> results = new();
             foreach (string patternToMatch in patternsToMatch)
             {
                 bool matchFound = false;
@@ -102,12 +102,12 @@ internal Collection<PSTraceSource> GetMatchingTraceSource(
                         !WildcardPattern.ContainsWildcardCharacters(patternToMatch))
                     {
                         ItemNotFoundException itemNotFound =
-                            new ItemNotFoundException(
+                            new(
                                 patternToMatch,
                                 "TraceSourceNotFound",
                                 SessionStateStrings.TraceSourceNotFound);
 
-                        ErrorRecord errorRecord = new ErrorRecord(itemNotFound.ErrorRecord, itemNotFound);
+                        ErrorRecord errorRecord = new(itemNotFound.ErrorRecord, itemNotFound);
                         WriteError(errorRecord);
                     }
                 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
@@ -541,6 +541,6 @@ private static ErrorRecord ConvertToErrorRecord(object obj)
         private readonly TraceListenerCommandBase _cmdlet;
         private readonly bool _writeError;
         private bool _isOpen = true;
-        private readonly Collection<PSTraceSource> _matchingSources = new Collection<PSTraceSource>();
+        private readonly Collection<PSTraceSource> _matchingSources = new();
     }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceListenerCommandBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceListenerCommandBase.cs
@@ -229,7 +229,7 @@ internal void AddTraceListenersToSources(Collection<PSTraceSource> matchingSourc
 
                     try
                     {
-                        Collection<string> resolvedPaths = new Collection<string>();
+                        Collection<string> resolvedPaths = new();
                         try
                         {
                             // Resolve the file path
@@ -287,7 +287,7 @@ internal void AddTraceListenersToSources(Collection<PSTraceSource> matchingSourc
                             if (ForceWrite && System.IO.File.Exists(resolvedPath))
                             {
                                 // remove readonly attributes on the file
-                                System.IO.FileInfo fInfo = new System.IO.FileInfo(resolvedPath);
+                                System.IO.FileInfo fInfo = new(resolvedPath);
                                 if (fInfo != null)
                                 {
                                     // Save some disk write time by checking whether file is readonly..
@@ -300,13 +300,13 @@ internal void AddTraceListenersToSources(Collection<PSTraceSource> matchingSourc
                             }
 
                             // Trace commands always append..So there is no need to set overwrite with force..
-                            FileStream fileStream = new FileStream(resolvedPath, FileMode.Append, FileAccess.Write, FileShare.ReadWrite);
+                            FileStream fileStream = new(resolvedPath, FileMode.Append, FileAccess.Write, FileShare.ReadWrite);
                             FileStreams.Add(fileStream);
 
                             // Open the file stream
 
                             TextWriterTraceListener fileListener =
-                                    new TextWriterTraceListener(fileStream, resolvedPath);
+                                    new(fileStream, resolvedPath);
 
                             fileListener.Name = FileListener;
 
@@ -328,7 +328,7 @@ internal void AddTraceListenersToSources(Collection<PSTraceSource> matchingSourc
                         if (fileOpenError != null)
                         {
                             ErrorRecord errorRecord =
-                                new ErrorRecord(
+                                new(
                                     fileOpenError,
                                     "FileListenerPathResolutionFailed",
                                     ErrorCategory.OpenError,
@@ -353,7 +353,7 @@ internal void AddTraceListenersToSources(Collection<PSTraceSource> matchingSourc
                     if (error != null)
                     {
                         ErrorRecord errorRecord =
-                            new ErrorRecord(
+                            new(
                                 error,
                                 "FileListenerPathResolutionFailed",
                                 ErrorCategory.InvalidArgument,
@@ -491,7 +491,7 @@ internal void TurnOnTracing(Collection<PSTraceSource> matchingSources, bool preC
                 {
                     // Copy the listeners into a different collection
 
-                    Collection<TraceListener> listenerCollection = new Collection<TraceListener>();
+                    Collection<TraceListener> listenerCollection = new();
                     foreach (TraceListener listener in source.Listeners)
                     {
                         listenerCollection.Add(listener);
@@ -596,7 +596,7 @@ protected void ClearStoredState()
         }
 
         private readonly Dictionary<PSTraceSource, KeyValuePair<PSTraceSourceOptions, Collection<TraceListener>>> _storedTraceSourceState =
-            new Dictionary<PSTraceSource, KeyValuePair<PSTraceSourceOptions, Collection<TraceListener>>>();
+            new();
 
         #endregion stored state
     }

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public override void Write(string output)`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`		`- private readonly StringBuilder _cachedWrite = new StringBuilder();`
	`90`	`+ private readonly StringBuilder _cachedWrite = new();`
`91`	`91`
`92`	`92`	`/// <summary>`
`93`	`93`	`/// Sends the given output string to the host for processing.`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ internal Collection<PSTraceSource> GetMatchingTraceSource(`
`56`	`56`	`{`
`57`	`57`	`notMatched = new Collection<string>();`
`58`	`58`
`59`		`- Collection<PSTraceSource> results = new Collection<PSTraceSource>();`
	`59`	`+ Collection<PSTraceSource> results = new();`
`60`	`60`	`foreach (string patternToMatch in patternsToMatch)`
`61`	`61`	`{`
`62`	`62`	`bool matchFound = false;`
`@@ -102,12 +102,12 @@ internal Collection<PSTraceSource> GetMatchingTraceSource(`
`102`	`102`	`!WildcardPattern.ContainsWildcardCharacters(patternToMatch))`
`103`	`103`	`{`
`104`	`104`	`ItemNotFoundException itemNotFound =`
`105`		`- new ItemNotFoundException(`
	`105`	`+ new(`
`106`	`106`	`patternToMatch,`
`107`	`107`	`"TraceSourceNotFound",`
`108`	`108`	`SessionStateStrings.TraceSourceNotFound);`
`109`	`109`
`110`		`- ErrorRecord errorRecord = new ErrorRecord(itemNotFound.ErrorRecord, itemNotFound);`
	`110`	`+ ErrorRecord errorRecord = new(itemNotFound.ErrorRecord, itemNotFound);`
`111`	`111`	`WriteError(errorRecord);`
`112`	`112`	`}`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -541,6 +541,6 @@ private static ErrorRecord ConvertToErrorRecord(object obj)`
`541`	`541`	`private readonly TraceListenerCommandBase _cmdlet;`
`542`	`542`	`private readonly bool _writeError;`
`543`	`543`	`private bool _isOpen = true;`
`544`		`- private readonly Collection<PSTraceSource> _matchingSources = new Collection<PSTraceSource>();`
	`544`	`+ private readonly Collection<PSTraceSource> _matchingSources = new();`
`545`	`545`	`}`
`546`	`546`	`}`
Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ internal void AddTraceListenersToSources(Collection<PSTraceSource> matchingSourc`
`229`	`229`
`230`	`230`	`try`
`231`	`231`	`{`
`232`		`- Collection<string> resolvedPaths = new Collection<string>();`
	`232`	`+ Collection<string> resolvedPaths = new();`
`233`	`233`	`try`
`234`	`234`	`{`
`235`	`235`	`// Resolve the file path`
`@@ -287,7 +287,7 @@ internal void AddTraceListenersToSources(Collection<PSTraceSource> matchingSourc`
`287`	`287`	`if (ForceWrite && System.IO.File.Exists(resolvedPath))`
`288`	`288`	`{`
`289`	`289`	`// remove readonly attributes on the file`
`290`		`- System.IO.FileInfo fInfo = new System.IO.FileInfo(resolvedPath);`
	`290`	`+ System.IO.FileInfo fInfo = new(resolvedPath);`
`291`	`291`	`if (fInfo != null)`
`292`	`292`	`{`
`293`	`293`	`// Save some disk write time by checking whether file is readonly..`
`@@ -300,13 +300,13 @@ internal void AddTraceListenersToSources(Collection<PSTraceSource> matchingSourc`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`// Trace commands always append..So there is no need to set overwrite with force..`
`303`		`- FileStream fileStream = new FileStream(resolvedPath, FileMode.Append, FileAccess.Write, FileShare.ReadWrite);`
	`303`	`+ FileStream fileStream = new(resolvedPath, FileMode.Append, FileAccess.Write, FileShare.ReadWrite);`
`304`	`304`	`FileStreams.Add(fileStream);`
`305`	`305`
`306`	`306`	`// Open the file stream`
`307`	`307`
`308`	`308`	`TextWriterTraceListener fileListener =`
`309`		`- new TextWriterTraceListener(fileStream, resolvedPath);`
	`309`	`+ new(fileStream, resolvedPath);`
`310`	`310`
`311`	`311`	`fileListener.Name = FileListener;`
`312`	`312`
`@@ -328,7 +328,7 @@ internal void AddTraceListenersToSources(Collection<PSTraceSource> matchingSourc`
`328`	`328`	`if (fileOpenError != null)`
`329`	`329`	`{`
`330`	`330`	`ErrorRecord errorRecord =`
`331`		`- new ErrorRecord(`
	`331`	`+ new(`
`332`	`332`	`fileOpenError,`
`333`	`333`	`"FileListenerPathResolutionFailed",`
`334`	`334`	`ErrorCategory.OpenError,`
`@@ -353,7 +353,7 @@ internal void AddTraceListenersToSources(Collection<PSTraceSource> matchingSourc`
`353`	`353`	`if (error != null)`
`354`	`354`	`{`
`355`	`355`	`ErrorRecord errorRecord =`
`356`		`- new ErrorRecord(`
	`356`	`+ new(`
`357`	`357`	`error,`
`358`	`358`	`"FileListenerPathResolutionFailed",`
`359`	`359`	`ErrorCategory.InvalidArgument,`
`@@ -491,7 +491,7 @@ internal void TurnOnTracing(Collection<PSTraceSource> matchingSources, bool preC`
`491`	`491`	`{`
`492`	`492`	`// Copy the listeners into a different collection`
`493`	`493`
`494`		`- Collection<TraceListener> listenerCollection = new Collection<TraceListener>();`
	`494`	`+ Collection<TraceListener> listenerCollection = new();`
`495`	`495`	`foreach (TraceListener listener in source.Listeners)`
`496`	`496`	`{`
`497`	`497`	`listenerCollection.Add(listener);`
`@@ -596,7 +596,7 @@ protected void ClearStoredState()`
`596`	`596`	`}`
`597`	`597`
`598`	`598`	`private readonly Dictionary<PSTraceSource, KeyValuePair<PSTraceSourceOptions, Collection<TraceListener>>> _storedTraceSourceState =`
`599`		`- new Dictionary<PSTraceSource, KeyValuePair<PSTraceSourceOptions, Collection<TraceListener>>>();`
	`599`	`+ new();`
`600`	`600`
`601`	`601`	`#endregion stored state`
`602`	`602`	`}`