Use null propagation operator in System.Management.Automation (PowerShell#17792)

fflaten · web-flow · commit d204d29035ab · 2022-08-01T09:20:09.000-07:00
diff --git a/src/System.Management.Automation/DscSupport/CimDSCParser.cs b/src/System.Management.Automation/DscSupport/CimDSCParser.cs
@@ -970,10 +970,7 @@ public static List<CimClass> ImportClasses(string path, Tuple<string, Version> m
             {
                 // Ignore modules with invalid schemas.
                 s_tracer.WriteLine("DSC ClassCache: Error importing file '{0}', with error '{1}'.  Skipping file.", path, e);
-                if (errors != null)
-                {
-                    errors.Add(e);
-                }
+                errors?.Add(e);
             }
 
             if (classes != null)
@@ -1000,10 +997,7 @@ public static List<CimClass> ImportClasses(string path, Tuple<string, Version> m
                                 ParserStrings.DuplicateCimClassDefinition, className, path, files);
 
                             e.SetErrorId("DuplicateCimClassDefinition");
-                            if (errors != null)
-                            {
-                                errors.Add(e);
-                            }
+                            errors?.Add(e);
                         }
                     }
 
diff --git a/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs
@@ -239,10 +239,7 @@ internal IndentationStackFrame(IndentationManager mgr)
 
             public void Dispose()
             {
-                if (_mgr != null)
-                {
-                    _mgr.RemoveStackFrame();
-                }
+                _mgr?.RemoveStackFrame();
             }
 
             private readonly IndentationManager _mgr;
diff --git a/src/System.Management.Automation/FormatAndOutput/common/FormattingObjectsDeserializer.cs b/src/System.Management.Automation/FormatAndOutput/common/FormattingObjectsDeserializer.cs
@@ -325,9 +325,7 @@ internal WriteStreamType DeserializeWriteStreamTypeMemberVariable(PSObject so)
         internal FormatInfoData DeserializeObject(PSObject so)
         {
             FormatInfoData fid = FormatInfoDataClassFactory.CreateInstance(so, this);
-
-            if (fid != null)
-                fid.Deserialize(so, this);
+            fid?.Deserialize(so, this);
             return fid;
         }
 
diff --git a/src/System.Management.Automation/FormatAndOutput/common/OutputManager.cs b/src/System.Management.Automation/FormatAndOutput/common/OutputManager.cs
@@ -92,19 +92,14 @@ internal override void ProcessRecord()
         internal override void EndProcessing()
         {
             // shut down only if we ever processed a pipeline object
-            if (_mgr != null)
-                _mgr.ShutDown();
+            _mgr?.ShutDown();
         }
 
         internal override void StopProcessing()
         {
             lock (_syncRoot)
             {
-                if (_lo != null)
-                {
-                    _lo.StopProcessing();
-                }
-
+                _lo?.StopProcessing();
                 _isStopped = true;
             }
         }
diff --git a/src/System.Management.Automation/cimSupport/cmdletization/ObjectModelWrapper.cs b/src/System.Management.Automation/cimSupport/cmdletization/ObjectModelWrapper.cs
@@ -50,10 +50,7 @@ internal void Initialize(PSCmdlet cmdlet, string className, string classVersion,
                         delegate
                         {
                             var disposable = this as IDisposable;
-                            if (disposable != null)
-                            {
-                                disposable.Dispose();
-                            }
+                            disposable?.Dispose();
                         };
             }
         }
diff --git a/src/System.Management.Automation/help/CabinetNativeApi.cs b/src/System.Management.Automation/help/CabinetNativeApi.cs
@@ -70,10 +70,7 @@ protected override void Dispose(bool disposing)
             }
 
             // Free managed objects within 'if (disposing)' if needed
-            if (fdiContext != null)
-            {
-                fdiContext.Dispose();
-            }
+            fdiContext?.Dispose();
             // Free unmanaged objects here
             this.CleanUpDelegates();
 
diff --git a/src/System.Management.Automation/help/SaveHelpCommand.cs b/src/System.Management.Automation/help/SaveHelpCommand.cs
@@ -260,10 +260,7 @@ internal override bool ProcessModuleWithCulture(UpdatableHelpModuleInfo module,
                 }
                 finally
                 {
-                    if (helpInfoDrive != null)
-                    {
-                        helpInfoDrive.Dispose();
-                    }
+                    helpInfoDrive?.Dispose();
                 }
             }
 
@@ -407,10 +404,7 @@ internal override bool ProcessModuleWithCulture(UpdatableHelpModuleInfo module,
                         }
                         finally
                         {
-                            if (helpContentDrive != null)
-                            {
-                                helpContentDrive.Dispose();
-                            }
+                            helpContentDrive?.Dispose();
                         }
                     }
                 }
diff --git a/src/System.Management.Automation/help/UpdateHelpCommand.cs b/src/System.Management.Automation/help/UpdateHelpCommand.cs
@@ -322,10 +322,7 @@ internal override bool ProcessModuleWithCulture(UpdatableHelpModuleInfo module,
                 }
                 finally
                 {
-                    if (helpInfoDrive != null)
-                    {
-                        helpInfoDrive.Dispose();
-                    }
+                    helpInfoDrive?.Dispose();
                 }
             }
             else
diff --git a/src/System.Management.Automation/namespaces/AliasProvider.cs b/src/System.Management.Automation/namespaces/AliasProvider.cs
@@ -194,11 +194,7 @@ internal override void SetSessionStateItem(string name, object value, bool write
                 if (dynamicParametersSpecified)
                 {
                     item = (AliasInfo)GetSessionStateItem(name);
-
-                    if (item != null)
-                    {
-                        item.SetOptions(dynamicParameters.Options, Force);
-                    }
+                    item?.SetOptions(dynamicParameters.Options, Force);
                 }
                 else
                 {
diff --git a/src/System.Management.Automation/namespaces/CoreCommandContext.cs b/src/System.Management.Automation/namespaces/CoreCommandContext.cs
@@ -390,13 +390,8 @@ private void CopyFilters(CmdletProviderContext context)
             Filter = context.Filter;
         }
 
-        internal void RemoveStopReferral()
-        {
-            if (_copiedContext != null)
-            {
-                _copiedContext.StopReferrals.Remove(this);
-            }
-        }
+        internal void RemoveStopReferral() => _copiedContext?.StopReferrals.Remove(this);
+
         #endregion Internal properties
 
         #region Public properties
@@ -774,65 +769,29 @@ internal bool ShouldContinue(
         /// <param name="text">
         /// The string that needs to be written.
         /// </param>
-        internal void WriteVerbose(string text)
-        {
-            if (_command != null)
-            {
-                _command.WriteVerbose(text);
-            }
-        }
+        internal void WriteVerbose(string text) => _command?.WriteVerbose(text);
 
         /// <summary>
         /// Writes the object to the Warning pipe.
         /// </summary>
         /// <param name="text">
         /// The string that needs to be written.
         /// </param>
-        internal void WriteWarning(string text)
-        {
-            if (_command != null)
-            {
-                _command.WriteWarning(text);
-            }
-        }
+        internal void WriteWarning(string text) => _command?.WriteWarning(text);
 
-        internal void WriteProgress(ProgressRecord record)
-        {
-            if (_command != null)
-            {
-                _command.WriteProgress(record);
-            }
-        }
+        internal void WriteProgress(ProgressRecord record) => _command?.WriteProgress(record);
 
         /// <summary>
         /// Writes a debug string.
         /// </summary>
         /// <param name="text">
         /// The String that needs to be written.
         /// </param>
-        internal void WriteDebug(string text)
-        {
-            if (_command != null)
-            {
-                _command.WriteDebug(text);
-            }
-        }
+        internal void WriteDebug(string text) => _command?.WriteDebug(text);
 
-        internal void WriteInformation(InformationRecord record)
-        {
-            if (_command != null)
-            {
-                _command.WriteInformation(record);
-            }
-        }
+        internal void WriteInformation(InformationRecord record) => _command?.WriteInformation(record);
 
-        internal void WriteInformation(object messageData, string[] tags)
-        {
-            if (_command != null)
-            {
-                _command.WriteInformation(messageData, tags);
-            }
-        }
+        internal void WriteInformation(object messageData, string[] tags) => _command?.WriteInformation(messageData, tags);
 
         #endregion User feedback mechanisms
 
@@ -1154,14 +1113,10 @@ internal void StopProcessing()
         {
             Stopping = true;
 
-            if (_providerInstance != null)
-            {
-                // We don't need to catch any of the exceptions here because
-                // we are terminating the pipeline and any exception will
-                // be caught by the engine.
-
-                _providerInstance.StopProcessing();
-            }
+            // We don't need to catch any of the exceptions here because
+            // we are terminating the pipeline and any exception will
+            // be caught by the engine.
+            _providerInstance?.StopProcessing();
 
             // Call the stop referrals if any
 
diff --git a/src/System.Management.Automation/namespaces/FileSystemContentStream.cs b/src/System.Management.Automation/namespaces/FileSystemContentStream.cs
@@ -987,9 +987,8 @@ private void WaitForChanges(string filePath, FileMode fileMode, FileAccess fileA
 
             // Seek to the place we last left off.
             _stream.Seek(_fileOffset, SeekOrigin.Begin);
-            if (_reader != null) { _reader.DiscardBufferedData(); }
-
-            if (_backReader != null) { _backReader.DiscardBufferedData(); }
+            _reader?.DiscardBufferedData();
+            _backReader?.DiscardBufferedData();
         }
 
         /// <summary>
@@ -1003,15 +1002,13 @@ private void WaitForChanges(string filePath, FileMode fileMode, FileAccess fileA
         /// </param>
         public void Seek(long offset, SeekOrigin origin)
         {
-            if (_writer != null) { _writer.Flush(); }
+            _writer?.Flush();
 
             _stream.Seek(offset, origin);
 
-            if (_writer != null) { _writer.Flush(); }
-
-            if (_reader != null) { _reader.DiscardBufferedData(); }
-
-            if (_backReader != null) { _backReader.DiscardBufferedData(); }
+            _writer?.Flush();
+            _reader?.DiscardBufferedData();
+            _backReader?.DiscardBufferedData();
         }
 
         /// <summary>
@@ -1135,14 +1132,10 @@ internal void Dispose(bool isDisposing)
         {
             if (isDisposing)
             {
-                if (_stream != null)
-                    _stream.Dispose();
-                if (_reader != null)
-                    _reader.Dispose();
-                if (_backReader != null)
-                    _backReader.Dispose();
-                if (_writer != null)
-                    _writer.Dispose();
+                _stream?.Dispose();
+                _reader?.Dispose();
+                _backReader?.Dispose();
+                _writer?.Dispose();
             }
         }
     }
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -4520,10 +4520,7 @@ private bool PerformCopyFileFromRemoteSession(string sourceFileFullName, FileInf
             }
             finally
             {
-                if (wStream != null)
-                {
-                    wStream.Dispose();
-                }
+                wStream?.Dispose();
 
                 // If copying the file from the remote session failed, then remove it.
                 if (errorWhileCopyRemoteFile && File.Exists(destinationFile.FullName))
@@ -4803,10 +4800,7 @@ private bool CopyFileStreamToRemoteSession(FileInfo file, string destinationPath
             }
             finally
             {
-                if (fStream != null)
-                {
-                    fStream.Dispose();
-                }
+                fStream?.Dispose();
             }
 
             return success;
diff --git a/src/System.Management.Automation/utils/CryptoUtils.cs b/src/System.Management.Automation/utils/CryptoUtils.cs
@@ -616,15 +616,8 @@ private void Dispose(bool disposing)
         {
             if (disposing)
             {
-                if (_rsa != null)
-                {
-                    _rsa.Dispose();
-                }
-
-                if (_aes != null)
-                {
-                    _aes.Dispose();
-                }
+                _rsa?.Dispose();
+                _aes?.Dispose();
             }
         }
 
@@ -851,11 +844,7 @@ public void Dispose(bool disposing)
         {
             if (disposing)
             {
-                if (_rsaCryptoProvider != null)
-                {
-                    _rsaCryptoProvider.Dispose();
-                }
-
+                _rsaCryptoProvider?.Dispose();
                 _rsaCryptoProvider = null;
 
                 _keyExchangeCompleted.Dispose();
diff --git a/src/System.Management.Automation/utils/ObjectStream.cs b/src/System.Management.Automation/utils/ObjectStream.cs
@@ -1496,16 +1496,8 @@ protected override void Dispose(bool disposing)
                 _writeHandle.Dispose();
                 _writeClosedHandle.Dispose();
                 _readClosedHandle.Dispose();
-
-                if (_readWaitHandle != null)
-                {
-                    _readWaitHandle.Dispose();
-                }
-
-                if (_writeWaitHandle != null)
-                {
-                    _writeWaitHandle.Dispose();
-                }
+                _readWaitHandle?.Dispose();
+                _writeWaitHandle?.Dispose();
 
                 if (_reader != null)
                 {
diff --git a/src/System.Management.Automation/utils/RuntimeException.cs b/src/System.Management.Automation/utils/RuntimeException.cs
@@ -211,8 +211,7 @@ internal void SetErrorCategory(ErrorCategory errorCategory)
         internal void SetTargetObject(object targetObject)
         {
             _targetObject = targetObject;
-            if (_errorRecord != null)
-                _errorRecord.SetTargetObject(targetObject);
+            _errorRecord?.SetTargetObject(targetObject);
         }
         #endregion ErrorRecord
 

Original file line number	Diff line number	Diff line change
`@@ -970,10 +970,7 @@ public static List<CimClass> ImportClasses(string path, Tuple<string, Version> m`
`970`	`970`	`{`
`971`	`971`	`// Ignore modules with invalid schemas.`
`972`	`972`	`s_tracer.WriteLine("DSC ClassCache: Error importing file '{0}', with error '{1}'. Skipping file.", path, e);`
`973`		`- if (errors != null)`
`974`		`- {`
`975`		`- errors.Add(e);`
`976`		`- }`
	`973`	`+ errors?.Add(e);`
`977`	`974`	`}`
`978`	`975`
`979`	`976`	`if (classes != null)`
`@@ -1000,10 +997,7 @@ public static List<CimClass> ImportClasses(string path, Tuple<string, Version> m`
`1000`	`997`	`ParserStrings.DuplicateCimClassDefinition, className, path, files);`
`1001`	`998`
`1002`	`999`	`e.SetErrorId("DuplicateCimClassDefinition");`
`1003`		`- if (errors != null)`
`1004`		`- {`
`1005`		`- errors.Add(e);`
`1006`		`- }`
	`1000`	`+ errors?.Add(e);`
`1007`	`1001`	`}`
`1008`	`1002`	`}`
`1009`	`1003`
Original file line number	Diff line number	Diff line change
`@@ -239,10 +239,7 @@ internal IndentationStackFrame(IndentationManager mgr)`
`239`	`239`
`240`	`240`	`public void Dispose()`
`241`	`241`	`{`
`242`		`- if (_mgr != null)`
`243`		`- {`
`244`		`- _mgr.RemoveStackFrame();`
`245`		`- }`
	`242`	`+ _mgr?.RemoveStackFrame();`
`246`	`243`	`}`
`247`	`244`
`248`	`245`	`private readonly IndentationManager _mgr;`
Original file line number	Diff line number	Diff line change
`@@ -325,9 +325,7 @@ internal WriteStreamType DeserializeWriteStreamTypeMemberVariable(PSObject so)`
`325`	`325`	`internal FormatInfoData DeserializeObject(PSObject so)`
`326`	`326`	`{`
`327`	`327`	`FormatInfoData fid = FormatInfoDataClassFactory.CreateInstance(so, this);`
`328`		`-`
`329`		`- if (fid != null)`
`330`		`- fid.Deserialize(so, this);`
	`328`	`+ fid?.Deserialize(so, this);`
`331`	`329`	`return fid;`
`332`	`330`	`}`
`333`	`331`
Original file line number	Diff line number	Diff line change
`@@ -92,19 +92,14 @@ internal override void ProcessRecord()`
`92`	`92`	`internal override void EndProcessing()`
`93`	`93`	`{`
`94`	`94`	`// shut down only if we ever processed a pipeline object`
`95`		`- if (_mgr != null)`
`96`		`- _mgr.ShutDown();`
	`95`	`+ _mgr?.ShutDown();`
`97`	`96`	`}`
`98`	`97`
`99`	`98`	`internal override void StopProcessing()`
`100`	`99`	`{`
`101`	`100`	`lock (_syncRoot)`
`102`	`101`	`{`
`103`		`- if (_lo != null)`
`104`		`- {`
`105`		`- _lo.StopProcessing();`
`106`		`- }`
`107`		`-`
	`102`	`+ _lo?.StopProcessing();`
`108`	`103`	`_isStopped = true;`
`109`	`104`	`}`
`110`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,7 @@ internal void Initialize(PSCmdlet cmdlet, string className, string classVersion,`
`50`	`50`	`delegate`
`51`	`51`	`{`
`52`	`52`	`var disposable = this as IDisposable;`
`53`		`- if (disposable != null)`
`54`		`- {`
`55`		`- disposable.Dispose();`
`56`		`- }`
	`53`	`+ disposable?.Dispose();`
`57`	`54`	`};`
`58`	`55`	`}`
`59`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -260,10 +260,7 @@ internal override bool ProcessModuleWithCulture(UpdatableHelpModuleInfo module,`
`260`	`260`	`}`
`261`	`261`	`finally`
`262`	`262`	`{`
`263`		`- if (helpInfoDrive != null)`
`264`		`- {`
`265`		`- helpInfoDrive.Dispose();`
`266`		`- }`
	`263`	`+ helpInfoDrive?.Dispose();`
`267`	`264`	`}`
`268`	`265`	`}`
`269`	`266`
`@@ -407,10 +404,7 @@ internal override bool ProcessModuleWithCulture(UpdatableHelpModuleInfo module,`
`407`	`404`	`}`
`408`	`405`	`finally`
`409`	`406`	`{`
`410`		`- if (helpContentDrive != null)`
`411`		`- {`
`412`		`- helpContentDrive.Dispose();`
`413`		`- }`
	`407`	`+ helpContentDrive?.Dispose();`
`414`	`408`	`}`
`415`	`409`	`}`
`416`	`410`	`}`
Original file line number	Diff line number	Diff line change
`@@ -322,10 +322,7 @@ internal override bool ProcessModuleWithCulture(UpdatableHelpModuleInfo module,`
`322`	`322`	`}`
`323`	`323`	`finally`
`324`	`324`	`{`
`325`		`- if (helpInfoDrive != null)`
`326`		`- {`
`327`		`- helpInfoDrive.Dispose();`
`328`		`- }`
	`325`	`+ helpInfoDrive?.Dispose();`
`329`	`326`	`}`
`330`	`327`	`}`
`331`	`328`	`else`
Original file line number	Diff line number	Diff line change
`@@ -194,11 +194,7 @@ internal override void SetSessionStateItem(string name, object value, bool write`
`194`	`194`	`if (dynamicParametersSpecified)`
`195`	`195`	`{`
`196`	`196`	`item = (AliasInfo)GetSessionStateItem(name);`
`197`		`-`
`198`		`- if (item != null)`
`199`		`- {`
`200`		`- item.SetOptions(dynamicParameters.Options, Force);`
`201`		`- }`
	`197`	`+ item?.SetOptions(dynamicParameters.Options, Force);`
`202`	`198`	`}`
`203`	`199`	`else`
`204`	`200`	`{`