Small suggested cleanups while browsing

Author: andyleejordan

src/PowerShellEditorServices.Hosting/Commands/StartEditorServicesCommand.cs

@@ -15,7 +15,6 @@
 #if DEBUG
 using System.Diagnostics;
 using System.Threading;
-
 using Debugger = System.Diagnostics.Debugger;
 #endif
 
@@ -197,9 +196,11 @@ protected override void BeginProcessing()
 #if DEBUG
             if (WaitForDebugger)
             {
+                // NOTE: Ignore the suggestion to use Environment.ProcessId as it doesn't work for
+                // .NET 4.6.2 (for Windows PowerShell), and this won't be caught in CI.
+                Console.WriteLine($"Waiting for debugger to attach, PID: {Process.GetCurrentProcess().Id}");
                 while (!Debugger.IsAttached)
                 {
-                    Console.WriteLine($"PID: {Process.GetCurrentProcess().Id}");
                     Thread.Sleep(1000);
                 }
             }

src/PowerShellEditorServices/Services/DebugAdapter/Debugging/VariableDetails.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
 using System;
@@ -98,16 +98,11 @@ public VariableDetails(string name, object value)
         /// If this variable instance is expandable, this method returns the
         /// details of its children.  Otherwise it returns an empty array.
         /// </summary>
-        /// <returns></returns>
         public override VariableDetailsBase[] GetChildren(ILogger logger)
         {
             if (IsExpandable)
             {
-                if (cachedChildren == null)
-                {
-                    cachedChildren = GetChildren(ValueObject, logger);
-                }
-
+                cachedChildren ??= GetChildren(ValueObject, logger);
                 return cachedChildren;
             }
 
@@ -131,9 +126,7 @@ private static bool GetIsExpandable(object valueObject)
                 valueObject = psobject.BaseObject;
             }
 
-            Type valueType =
-                valueObject?.GetType();
-
+            Type valueType = valueObject?.GetType();
             TypeInfo valueTypeInfo = valueType.GetTypeInfo();
 
             return
@@ -379,7 +372,7 @@ protected static void AddDotNetProperties(object obj, List<VariableDetails> chil
 
         #endregion
 
-        private struct UnableToRetrievePropertyMessage
+        private readonly struct UnableToRetrievePropertyMessage
         {
             public UnableToRetrievePropertyMessage(string message) => Message = message;
 

src/PowerShellEditorServices/Services/DebugAdapter/Debugging/VariableDetailsBase.cs

@@ -51,7 +51,6 @@ internal abstract class VariableDetailsBase
         /// If this variable instance is expandable, this method returns the
         /// details of its children.  Otherwise it returns an empty array.
         /// </summary>
-        /// <returns></returns>
         public abstract VariableDetailsBase[] GetChildren(ILogger logger);
     }
 }

src/PowerShellEditorServices/Services/DebugAdapter/Handlers/DebugEvaluateHandler.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
 using System;
@@ -64,21 +64,15 @@ await _executionService.ExecutePSCommandAsync(
                     result = _debugService.GetVariableFromExpression(request.Expression);
 
                     // If the expression is not a naked variable reference, then evaluate the expression.
-                    if (result == null)
-                    {
-                        result =
-                            await _debugService.EvaluateExpressionAsync(
-                                request.Expression,
-                                isFromRepl).ConfigureAwait(false);
-                    }
+                    result ??= await _debugService.EvaluateExpressionAsync(
+                        request.Expression,
+                        isFromRepl).ConfigureAwait(false);
                 }
 
                 if (result != null)
                 {
                     valueString = result.ValueString;
-                    variableId =
-                        result.IsExpandable ?
-                            result.Id : 0;
+                    variableId = result.IsExpandable ? result.Id : 0;
                 }
             }
 

src/PowerShellEditorServices/Services/PowerShell/Debugging/PowerShellDebugContext.cs

@@ -146,7 +146,7 @@ public void SetDebugResuming(DebuggerResumeAction debuggerResumeAction)
                 // TODO: We need to assign cancellation tokens to each frame, because the current
                 // logic results in a deadlock here when we try to cancel the scopes...which
                 // includes ourself (hence running it in a separate thread).
-                _ = Task.Run(() => _psesHost.UnwindCallStack());
+                _ = Task.Run(_psesHost.UnwindCallStack);
                 return;
             }
 

test/PowerShellEditorServices.Test/Debugging/DebugServiceTests.cs

@@ -496,7 +496,7 @@ public async Task DebuggerBreaksWhenRequested()
             Assert.Equal(0, confirmedBreakpoints.Count);
             Task _ = ExecuteDebugFileAsync();
             // NOTE: This must be run on a separate thread so the async event handlers can fire.
-            await Task.Run(() => debugService.Break()).ConfigureAwait(true);
+            await Task.Run(debugService.Break).ConfigureAwait(true);
             AssertDebuggerPaused();
         }
 
@@ -505,7 +505,7 @@ public async Task DebuggerRunsCommandsWhileStopped()
         {
             Task _ = ExecuteDebugFileAsync();
             // NOTE: This must be run on a separate thread so the async event handlers can fire.
-            await Task.Run(() => debugService.Break()).ConfigureAwait(true);
+            await Task.Run(debugService.Break).ConfigureAwait(true);
             AssertDebuggerPaused();
 
             // Try running a command from outside the pipeline thread
@@ -723,7 +723,7 @@ await debugService.SetLineBreakpointsAsync(
 
             // The above just tests that the debug service returns the correct new value string.
             // Let's step the debugger and make sure the values got set to the new values.
-            await Task.Run(() => debugService.StepOver()).ConfigureAwait(true);
+            await Task.Run(debugService.StepOver).ConfigureAwait(true);
             AssertDebuggerStopped(variableScriptFile.FilePath);
 
             // Test set of a local string variable (not strongly typed)
@@ -779,7 +779,7 @@ await debugService.SetLineBreakpointsAsync(
 
             // The above just tests that the debug service returns the correct new value string.
             // Let's step the debugger and make sure the values got set to the new values.
-            await Task.Run(() => debugService.StepOver()).ConfigureAwait(true);
+            await Task.Run(debugService.StepOver).ConfigureAwait(true);
             AssertDebuggerStopped(variableScriptFile.FilePath);
 
             // Test set of a local string variable (not strongly typed but force conversion)

test/PowerShellEditorServices.Test/Session/PsesInternalHostTests.cs

@@ -180,7 +180,7 @@ public async Task CanRunOnIdleTask()
                 new PSCommand().AddScript("$handled"),
                 CancellationToken.None).ConfigureAwait(true);
 
-            Assert.Collection(handled, (p) => Assert.False(p));
+            Assert.Collection(handled, Assert.False);
 
             await psesHost.ExecuteDelegateAsync(
                 nameof(psesHost.OnPowerShellIdle),
@@ -195,7 +195,7 @@ await psesHost.ExecuteDelegateAsync(
                 new PSCommand().AddScript("$handled"),
                 CancellationToken.None).ConfigureAwait(true);
 
-            Assert.Collection(handled, (p) => Assert.True(p));
+            Assert.Collection(handled, Assert.True);
         }
 
         [Fact]
@@ -301,7 +301,7 @@ await psesHost.ExecuteDelegateAsync(
                 new PSCommand().AddScript("$handledInProfile"),
                 CancellationToken.None).ConfigureAwait(true);
 
-            Assert.Collection(handled, (p) => Assert.True(p));
+            Assert.Collection(handled, Assert.True);
         }
     }
 }