Use null propagation operator in Management and ConsoleHost (PowerShell#17791)

fflaten · web-flow · commit 2d4a6bf47530 · 2022-08-01T09:20:44.000-07:00
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/SessionBasedWrapper.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/SessionBasedWrapper.cs
@@ -683,10 +683,7 @@ public override void EndProcessing()
         public override void StopProcessing()
         {
             Job jobToStop = _parentJob;
-            if (jobToStop != null)
-            {
-                jobToStop.StopJob();
-            }
+            jobToStop?.StopJob();
 
             base.StopProcessing();
         }
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimChildJobBase.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimChildJobBase.cs
@@ -315,10 +315,7 @@ internal override void StartJob()
                 this.ExceptionSafeWrapper(delegate
                 {
                     IObservable<T> observable = this.GetCimOperation();
-                    if (observable != null)
-                    {
-                        observable.Subscribe(this);
-                    }
+                    observable?.Subscribe(this);
                 });
             });
         }
@@ -522,10 +519,7 @@ internal CimOperationOptions CreateOperationOptions()
             }
 
             CimCustomOptionsDictionary jobSpecificCustomOptions = this.GetJobSpecificCustomOptions();
-            if (jobSpecificCustomOptions != null)
-            {
-                jobSpecificCustomOptions.Apply(operationOptions, CimSensitiveValueConverter);
-            }
+            jobSpecificCustomOptions?.Apply(operationOptions, CimSensitiveValueConverter);
 
             return operationOptions;
         }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ContentCommandBase.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ContentCommandBase.cs
@@ -377,10 +377,7 @@ internal void CloseContent(List<ContentHolder> contentHolders, bool disposing)
             {
                 try
                 {
-                    if (holder.Writer != null)
-                    {
-                        holder.Writer.Close();
-                    }
+                    holder.Writer?.Close();
                 }
                 catch (Exception e) // Catch-all OK. 3rd party callout
                 {
@@ -414,10 +411,7 @@ internal void CloseContent(List<ContentHolder> contentHolders, bool disposing)
 
                 try
                 {
-                    if (holder.Reader != null)
-                    {
-                        holder.Reader.Close();
-                    }
+                    holder.Reader?.Close();
                 }
                 catch (Exception e) // Catch-all OK. 3rd party callout
                 {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
@@ -938,10 +938,7 @@ private void myProcess_Exited(object sender, System.EventArgs e)
         {
             if (System.Threading.Interlocked.Decrement(ref _numberOfProcessesToWaitFor) == 0)
             {
-                if (_waitHandle != null)
-                {
-                    _waitHandle.Set();
-                }
+                _waitHandle?.Set();
             }
         }
 
@@ -1040,13 +1037,8 @@ protected override void EndProcessing()
         /// <summary>
         /// StopProcessing.
         /// </summary>
-        protected override void StopProcessing()
-        {
-            if (_waitHandle != null)
-            {
-                _waitHandle.Set();
-            }
-        }
+        protected override void StopProcessing() => _waitHandle?.Set();
+
         #endregion Overrides
 
     }
@@ -2079,13 +2071,7 @@ protected override void BeginProcessing()
         /// <summary>
         /// Implements ^c, after creating a process.
         /// </summary>
-        protected override void StopProcessing()
-        {
-            if (_waithandle != null)
-            {
-                _waithandle.Set();
-            }
-        }
+        protected override void StopProcessing() => _waithandle?.Set();
 
         #endregion
 
@@ -2116,13 +2102,7 @@ private void Dispose(bool isDisposing)
         /// <summary>
         /// When Process exits the wait handle is set.
         /// </summary>
-        private void myProcess_Exited(object sender, System.EventArgs e)
-        {
-            if (_waithandle != null)
-            {
-                _waithandle.Set();
-            }
-        }
+        private void myProcess_Exited(object sender, System.EventArgs e) => _waithandle?.Set();
 
         private string ResolveFilePath(string path)
         {
@@ -2221,15 +2201,8 @@ private void StreamClosing()
         {
             Thread.Sleep(1000);
 
-            if (_outputWriter != null)
-            {
-                _outputWriter.Dispose();
-            }
-
-            if (_errorWriter != null)
-            {
-                _errorWriter.Dispose();
-            }
+            _outputWriter?.Dispose();
+            _errorWriter?.Dispose();
         }
 
         private void SetupInputOutputRedirection(Process p)
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
@@ -189,10 +189,7 @@ internal static int Start(
                 if ((s_cpp.ServerMode && s_cpp.NamedPipeServerMode) || (s_cpp.ServerMode && s_cpp.SocketServerMode) || (s_cpp.NamedPipeServerMode && s_cpp.SocketServerMode))
                 {
                     s_tracer.TraceError("Conflicting server mode parameters, parameters must be used exclusively.");
-                    if (s_theConsoleHost != null)
-                    {
-                        s_theConsoleHost.ui.WriteErrorLine(ConsoleHostStrings.ConflictingServerModeParameters);
-                    }
+                    s_theConsoleHost?.ui.WriteErrorLine(ConsoleHostStrings.ConflictingServerModeParameters);
 
                     return ExitCodeBadCommandLineParameter;
                 }
@@ -501,10 +498,7 @@ private static void HandleBreak()
                     if (runspaceRef != null)
                     {
                         var runspace = runspaceRef.Runspace;
-                        if (runspace != null)
-                        {
-                            runspace.Close();
-                        }
+                        runspace?.Close();
                     }
                 }
             }
@@ -1266,15 +1260,8 @@ private void Dispose(bool isDisposingNotFinalizing)
                         StopTranscribing();
                     }
 
-                    if (_outputSerializer != null)
-                    {
-                        _outputSerializer.End();
-                    }
-
-                    if (_errorSerializer != null)
-                    {
-                        _errorSerializer.End();
-                    }
+                    _outputSerializer?.End();
+                    _errorSerializer?.End();
 
                     if (_runspaceRef != null)
                     {
@@ -2233,10 +2220,7 @@ private void OnExecutionSuspended(object sender, DebuggerStopEventArgs e)
                     // For remote debugging block data coming from the main (not-nested)
                     // running command.
                     baseLoop = InputLoop.GetNonNestedLoop();
-                    if (baseLoop != null)
-                    {
-                        baseLoop.BlockCommandOutput();
-                    }
+                    baseLoop?.BlockCommandOutput();
                 }
 
                 //
@@ -2281,10 +2265,7 @@ private void OnExecutionSuspended(object sender, DebuggerStopEventArgs e)
             finally
             {
                 _debuggerStopEventArgs = null;
-                if (baseLoop != null)
-                {
-                    baseLoop.ResumeCommandOutput();
-                }
+                baseLoop?.ResumeCommandOutput();
             }
         }
 
@@ -2670,10 +2651,7 @@ e is RemoteException ||
                                 bht = _parent._breakHandlerThread;
                             }
 
-                            if (bht != null)
-                            {
-                                bht.Join();
-                            }
+                            bht?.Join();
 
                             // Once the pipeline has been executed, we toss any outstanding progress data and
                             // take down the display.
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs
@@ -139,20 +139,14 @@ class ConsoleHostUserInterface : PSHostUserInterface
         void
         PreWrite()
         {
-            if (_progPane != null)
-            {
-                _progPane.Hide();
-            }
+            _progPane?.Hide();
         }
 
         private
         void
         PostWrite()
         {
-            if (_progPane != null)
-            {
-                _progPane.Show();
-            }
+            _progPane?.Show();
         }
 
         private
@@ -178,20 +172,14 @@ class ConsoleHostUserInterface : PSHostUserInterface
         void
         PreRead()
         {
-            if (_progPane != null)
-            {
-                _progPane.Hide();
-            }
+            _progPane?.Hide();
         }
 
         private
         void
         PostRead()
         {
-            if (_progPane != null)
-            {
-                _progPane.Show();
-            }
+            _progPane?.Show();
         }
 
         private
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs
@@ -599,11 +599,9 @@ internal void BlockCommandOutput()
         internal void ResumeCommandOutput()
         {
             RemotePipeline remotePipeline = _pipeline as RemotePipeline;
-            if (remotePipeline != null)
-            {
-                // Resumes data flow.
-                remotePipeline.ResumeIncomingData();
-            }
+
+            // Resumes data flow.
+            remotePipeline?.ResumeIncomingData();
         }
 
         /// <summary>
@@ -697,10 +695,7 @@ internal static void CancelCurrentExecutor()
                 temp = s_currentExecutor;
             }
 
-            if (temp != null)
-            {
-                temp.Cancel();
-            }
+            temp?.Cancel();
         }
 
         // These statics are threadsafe, as there can be only one instance of ConsoleHost in a process at a time, and access

Original file line number	Diff line number	Diff line change
`@@ -683,10 +683,7 @@ public override void EndProcessing()`
`683`	`683`	`public override void StopProcessing()`
`684`	`684`	`{`
`685`	`685`	`Job jobToStop = _parentJob;`
`686`		`- if (jobToStop != null)`
`687`		`- {`
`688`		`- jobToStop.StopJob();`
`689`		`- }`
	`686`	`+ jobToStop?.StopJob();`
`690`	`687`
`691`	`688`	`base.StopProcessing();`
`692`	`689`	`}`
Original file line number	Diff line number	Diff line change
`@@ -315,10 +315,7 @@ internal override void StartJob()`
`315`	`315`	`this.ExceptionSafeWrapper(delegate`
`316`	`316`	`{`
`317`	`317`	`IObservable<T> observable = this.GetCimOperation();`
`318`		`- if (observable != null)`
`319`		`- {`
`320`		`- observable.Subscribe(this);`
`321`		`- }`
	`318`	`+ observable?.Subscribe(this);`
`322`	`319`	`});`
`323`	`320`	`});`
`324`	`321`	`}`
`@@ -522,10 +519,7 @@ internal CimOperationOptions CreateOperationOptions()`
`522`	`519`	`}`
`523`	`520`
`524`	`521`	`CimCustomOptionsDictionary jobSpecificCustomOptions = this.GetJobSpecificCustomOptions();`
`525`		`- if (jobSpecificCustomOptions != null)`
`526`		`- {`
`527`		`- jobSpecificCustomOptions.Apply(operationOptions, CimSensitiveValueConverter);`
`528`		`- }`
	`522`	`+ jobSpecificCustomOptions?.Apply(operationOptions, CimSensitiveValueConverter);`
`529`	`523`
`530`	`524`	`return operationOptions;`
`531`	`525`	`}`
Original file line number	Diff line number	Diff line change
`@@ -377,10 +377,7 @@ internal void CloseContent(List<ContentHolder> contentHolders, bool disposing)`
`377`	`377`	`{`
`378`	`378`	`try`
`379`	`379`	`{`
`380`		`- if (holder.Writer != null)`
`381`		`- {`
`382`		`- holder.Writer.Close();`
`383`		`- }`
	`380`	`+ holder.Writer?.Close();`
`384`	`381`	`}`
`385`	`382`	`catch (Exception e) // Catch-all OK. 3rd party callout`
`386`	`383`	`{`
`@@ -414,10 +411,7 @@ internal void CloseContent(List<ContentHolder> contentHolders, bool disposing)`
`414`	`411`
`415`	`412`	`try`
`416`	`413`	`{`
`417`		`- if (holder.Reader != null)`
`418`		`- {`
`419`		`- holder.Reader.Close();`
`420`		`- }`
	`414`	`+ holder.Reader?.Close();`
`421`	`415`	`}`
`422`	`416`	`catch (Exception e) // Catch-all OK. 3rd party callout`
`423`	`417`	`{`
Original file line number	Diff line number	Diff line change
`@@ -189,10 +189,7 @@ internal static int Start(`
`189`	`189`	`if ((s_cpp.ServerMode && s_cpp.NamedPipeServerMode) \|\| (s_cpp.ServerMode && s_cpp.SocketServerMode) \|\| (s_cpp.NamedPipeServerMode && s_cpp.SocketServerMode))`
`190`	`190`	`{`
`191`	`191`	`s_tracer.TraceError("Conflicting server mode parameters, parameters must be used exclusively.");`
`192`		`- if (s_theConsoleHost != null)`
`193`		`- {`
`194`		`- s_theConsoleHost.ui.WriteErrorLine(ConsoleHostStrings.ConflictingServerModeParameters);`
`195`		`- }`
	`192`	`+ s_theConsoleHost?.ui.WriteErrorLine(ConsoleHostStrings.ConflictingServerModeParameters);`
`196`	`193`
`197`	`194`	`return ExitCodeBadCommandLineParameter;`
`198`	`195`	`}`
`@@ -501,10 +498,7 @@ private static void HandleBreak()`
`501`	`498`	`if (runspaceRef != null)`
`502`	`499`	`{`
`503`	`500`	`var runspace = runspaceRef.Runspace;`
`504`		`- if (runspace != null)`
`505`		`- {`
`506`		`- runspace.Close();`
`507`		`- }`
	`501`	`+ runspace?.Close();`
`508`	`502`	`}`
`509`	`503`	`}`
`510`	`504`	`}`
`@@ -1266,15 +1260,8 @@ private void Dispose(bool isDisposingNotFinalizing)`
`1266`	`1260`	`StopTranscribing();`
`1267`	`1261`	`}`
`1268`	`1262`
`1269`		`- if (_outputSerializer != null)`
`1270`		`- {`
`1271`		`- _outputSerializer.End();`
`1272`		`- }`
`1273`		`-`
`1274`		`- if (_errorSerializer != null)`
`1275`		`- {`
`1276`		`- _errorSerializer.End();`
`1277`		`- }`
	`1263`	`+ _outputSerializer?.End();`
	`1264`	`+ _errorSerializer?.End();`
`1278`	`1265`
`1279`	`1266`	`if (_runspaceRef != null)`
`1280`	`1267`	`{`
`@@ -2233,10 +2220,7 @@ private void OnExecutionSuspended(object sender, DebuggerStopEventArgs e)`
`2233`	`2220`	`// For remote debugging block data coming from the main (not-nested)`
`2234`	`2221`	`// running command.`
`2235`	`2222`	`baseLoop = InputLoop.GetNonNestedLoop();`
`2236`		`- if (baseLoop != null)`
`2237`		`- {`
`2238`		`- baseLoop.BlockCommandOutput();`
`2239`		`- }`
	`2223`	`+ baseLoop?.BlockCommandOutput();`
`2240`	`2224`	`}`
`2241`	`2225`
`2242`	`2226`	`//`
`@@ -2281,10 +2265,7 @@ private void OnExecutionSuspended(object sender, DebuggerStopEventArgs e)`
`2281`	`2265`	`finally`
`2282`	`2266`	`{`
`2283`	`2267`	`_debuggerStopEventArgs = null;`
`2284`		`- if (baseLoop != null)`
`2285`		`- {`
`2286`		`- baseLoop.ResumeCommandOutput();`
`2287`		`- }`
	`2268`	`+ baseLoop?.ResumeCommandOutput();`
`2288`	`2269`	`}`
`2289`	`2270`	`}`
`2290`	`2271`
`@@ -2670,10 +2651,7 @@ e is RemoteException \|\|`
`2670`	`2651`	`bht = _parent._breakHandlerThread;`
`2671`	`2652`	`}`
`2672`	`2653`
`2673`		`- if (bht != null)`
`2674`		`- {`
`2675`		`- bht.Join();`
`2676`		`- }`
	`2654`	`+ bht?.Join();`
`2677`	`2655`
`2678`	`2656`	`// Once the pipeline has been executed, we toss any outstanding progress data and`
`2679`	`2657`	`// take down the display.`
Original file line number	Diff line number	Diff line change
`@@ -139,20 +139,14 @@ class ConsoleHostUserInterface : PSHostUserInterface`
`139`	`139`	`void`
`140`	`140`	`PreWrite()`
`141`	`141`	`{`
`142`		`- if (_progPane != null)`
`143`		`- {`
`144`		`- _progPane.Hide();`
`145`		`- }`
	`142`	`+ _progPane?.Hide();`
`146`	`143`	`}`
`147`	`144`
`148`	`145`	`private`
`149`	`146`	`void`
`150`	`147`	`PostWrite()`
`151`	`148`	`{`
`152`		`- if (_progPane != null)`
`153`		`- {`
`154`		`- _progPane.Show();`
`155`		`- }`
	`149`	`+ _progPane?.Show();`
`156`	`150`	`}`
`157`	`151`
`158`	`152`	`private`
`@@ -178,20 +172,14 @@ class ConsoleHostUserInterface : PSHostUserInterface`
`178`	`172`	`void`
`179`	`173`	`PreRead()`
`180`	`174`	`{`
`181`		`- if (_progPane != null)`
`182`		`- {`
`183`		`- _progPane.Hide();`
`184`		`- }`
	`175`	`+ _progPane?.Hide();`
`185`	`176`	`}`
`186`	`177`
`187`	`178`	`private`
`188`	`179`	`void`
`189`	`180`	`PostRead()`
`190`	`181`	`{`
`191`		`- if (_progPane != null)`
`192`		`- {`
`193`		`- _progPane.Show();`
`194`		`- }`
	`182`	`+ _progPane?.Show();`
`195`	`183`	`}`
`196`	`184`
`197`	`185`	`private`
Original file line number	Diff line number	Diff line change
`@@ -599,11 +599,9 @@ internal void BlockCommandOutput()`
`599`	`599`	`internal void ResumeCommandOutput()`
`600`	`600`	`{`
`601`	`601`	`RemotePipeline remotePipeline = _pipeline as RemotePipeline;`
`602`		`- if (remotePipeline != null)`
`603`		`- {`
`604`		`- // Resumes data flow.`
`605`		`- remotePipeline.ResumeIncomingData();`
`606`		`- }`
	`602`	`+`
	`603`	`+ // Resumes data flow.`
	`604`	`+ remotePipeline?.ResumeIncomingData();`
`607`	`605`	`}`
`608`	`606`
`609`	`607`	`/// <summary>`
`@@ -697,10 +695,7 @@ internal static void CancelCurrentExecutor()`
`697`	`695`	`temp = s_currentExecutor;`
`698`	`696`	`}`
`699`	`697`
`700`		`- if (temp != null)`
`701`		`- {`
`702`		`- temp.Cancel();`
`703`		`- }`
	`698`	`+ temp?.Cancel();`
`704`	`699`	`}`
`705`	`700`
`706`	`701`	`// These statics are threadsafe, as there can be only one instance of ConsoleHost in a process at a time, and access`