Merge pull request #2000 from PowerShell/andschwa/code-review

andyleejordan · web-flow · commit e9310f9df7f7 · 2023-02-24T11:38:54.000-08:00
Code clean-up and fixing end-to-end tests
diff --git a/.editorconfig b/.editorconfig
@@ -39,7 +39,7 @@ dotnet_diagnostic.CS0649.severity = error
 # CS1570: Parameter has no matching param tag in the XML comment
 dotnet_diagnostic.CS1570.severity = silent
 # CS1574: XML comment has cref attribute that could not be resolved.
-dotnet_diagnostic.CS1574.severity = suggestion
+dotnet_diagnostic.CS1574.severity = silent
 # CS1591: Missing XML comment for publicly visible type or member
 dotnet_diagnostic.CS1591.severity = silent
 # CS1998: This async method lacks 'await' operators and will run synchronously
diff --git a/PowerShellEditorServices.build.ps1 b/PowerShellEditorServices.build.ps1
@@ -203,7 +203,7 @@ Task TestE2E Build, SetupHelpForTests, {
     Set-Location .\test\PowerShellEditorServices.Test.E2E\
 
     $env:PWSH_EXE_NAME = if ($IsCoreCLR) { "pwsh" } else { "powershell" }
-    Invoke-BuildExec { & dotnet $script:dotnetTestArgs $script:NetRuntime.PS72 }
+    Invoke-BuildExec { & dotnet $script:dotnetTestArgs $script:NetRuntime.PS73 }
 
     if (!$script:IsNix) {
         if (-not [Security.Principal.WindowsIdentity]::GetCurrent().Owner.IsWellKnown("BuiltInAdministratorsSid")) {
@@ -214,7 +214,7 @@ Task TestE2E Build, SetupHelpForTests, {
         try {
             Write-Host "Running end-to-end tests in Constrained Language Mode."
             [System.Environment]::SetEnvironmentVariable("__PSLockdownPolicy", "0x80000007", [System.EnvironmentVariableTarget]::Machine);
-            Invoke-BuildExec { & dotnet $script:dotnetTestArgs $script:NetRuntime.PS72 }
+            Invoke-BuildExec { & dotnet $script:dotnetTestArgs $script:NetRuntime.PS73 }
         } finally {
             [System.Environment]::SetEnvironmentVariable("__PSLockdownPolicy", $null, [System.EnvironmentVariableTarget]::Machine);
         }
diff --git a/src/PowerShellEditorServices/Extensions/EditorContext.cs b/src/PowerShellEditorServices/Extensions/EditorContext.cs
@@ -86,26 +86,15 @@ public void SetSelection(
         /// </summary>
         /// <param name="startPosition">The starting position of the selection.</param>
         /// <param name="endPosition">The ending position of the selection.</param>
-        public void SetSelection(
-            FilePosition startPosition,
-            FilePosition endPosition)
-        {
-            SetSelection(
-                new FileRange(
-                    startPosition,
-                    endPosition));
-        }
+        public void SetSelection(FilePosition startPosition, FilePosition endPosition) => SetSelection(new FileRange(startPosition, endPosition));
 
         /// <summary>
         /// Sets a selection in the host editor's active buffer.
         /// </summary>
         /// <param name="selectionRange">The range of the selection.</param>
-        public void SetSelection(FileRange selectionRange)
-        {
-            editorOperations
-                .SetSelectionAsync(selectionRange.ToBufferRange())
-                .Wait();
-        }
+        #pragma warning disable VSTHRD002
+        public void SetSelection(FileRange selectionRange) => editorOperations.SetSelectionAsync(selectionRange.ToBufferRange()).Wait();
+        #pragma warning restore VSTHRD002
 
         #endregion
     }
diff --git a/src/PowerShellEditorServices/Extensions/EditorFileRanges.cs b/src/PowerShellEditorServices/Extensions/EditorFileRanges.cs
@@ -274,7 +274,7 @@ public interface ILspCurrentFileContext : IFileContext
         ILspFileRange SelectionRange { get; }
     }
 
-    internal struct OmnisharpLspPosition : ILspFilePosition, IEquatable<OmnisharpLspPosition>
+    internal readonly struct OmnisharpLspPosition : ILspFilePosition, IEquatable<OmnisharpLspPosition>
     {
         private readonly Position _position;
 
@@ -287,7 +287,7 @@ internal struct OmnisharpLspPosition : ILspFilePosition, IEquatable<OmnisharpLsp
         public bool Equals(OmnisharpLspPosition other) => _position == other._position;
     }
 
-    internal struct OmnisharpLspRange : ILspFileRange, IEquatable<OmnisharpLspRange>
+    internal readonly struct OmnisharpLspRange : ILspFileRange, IEquatable<OmnisharpLspRange>
     {
         private readonly Range _range;
 
@@ -300,7 +300,7 @@ internal struct OmnisharpLspRange : ILspFileRange, IEquatable<OmnisharpLspRange>
         public bool Equals(OmnisharpLspRange other) => _range == other._range;
     }
 
-    internal struct BufferFilePosition : IFilePosition, IEquatable<BufferFilePosition>
+    internal readonly struct BufferFilePosition : IFilePosition, IEquatable<BufferFilePosition>
     {
         private readonly BufferPosition _position;
 
@@ -317,7 +317,7 @@ public bool Equals(BufferFilePosition other)
         }
     }
 
-    internal struct BufferFileRange : IFileRange, IEquatable<BufferFileRange>
+    internal readonly struct BufferFileRange : IFileRange, IEquatable<BufferFileRange>
     {
         private readonly BufferRange _range;
 
diff --git a/src/PowerShellEditorServices/Extensions/EditorObject.cs b/src/PowerShellEditorServices/Extensions/EditorObject.cs
@@ -115,7 +115,9 @@ internal EditorObject(
         /// at the time this method is invoked.
         /// </summary>
         /// <returns>A instance of the EditorContext class.</returns>
+        #pragma warning disable VSTHRD002, VSTHRD104
         public EditorContext GetEditorContext() => _editorOperations.GetEditorContextAsync().Result;
+        #pragma warning restore VSTHRD002, VSTHRD104
 
         internal void SetAsStaticInstance()
         {
diff --git a/src/PowerShellEditorServices/Extensions/EditorWindow.cs b/src/PowerShellEditorServices/Extensions/EditorWindow.cs
@@ -39,6 +39,7 @@ internal EditorWindow(IEditorOperations editorOperations)
         #endregion
 
         #region Public Methods
+        #pragma warning disable VSTHRD002 // These are public APIs that use async internal methods.
 
         /// <summary>
         /// Shows an informational message to the user.
@@ -71,6 +72,7 @@ internal EditorWindow(IEditorOperations editorOperations)
         /// <param name="timeout">A timeout in milliseconds for how long the message should remain visible.</param>
         public void SetStatusBarMessage(string message, int timeout) => editorOperations.SetStatusBarMessageAsync(message, timeout).Wait();
 
+        #pragma warning restore VSTHRD002
         #endregion
     }
 }
diff --git a/src/PowerShellEditorServices/Extensions/EditorWorkspace.cs b/src/PowerShellEditorServices/Extensions/EditorWorkspace.cs
@@ -31,6 +31,7 @@ public sealed class EditorWorkspace
         #endregion
 
         #region Public Methods
+        #pragma warning disable VSTHRD002 // These are public APIs that use async internal methods.
 
         /// <summary>
         /// Creates a new file in the editor
@@ -53,6 +54,7 @@ public sealed class EditorWorkspace
         /// <param name="preview">Determines wether the file is opened as a preview or as a durable editor.</param>
         public void OpenFile(string filePath, bool preview) => editorOperations.OpenFileAsync(filePath, preview).Wait();
 
+        #pragma warning restore VSTHRD002
         #endregion
     }
 }
diff --git a/src/PowerShellEditorServices/Extensions/FileContext.cs b/src/PowerShellEditorServices/Extensions/FileContext.cs
@@ -209,12 +209,14 @@ public void InsertText(
         /// </summary>
         /// <param name="textToInsert">The text string to insert.</param>
         /// <param name="insertRange">The buffer range which will be replaced by the string.</param>
+        #pragma warning disable VSTHRD002
         public void InsertText(string textToInsert, IFileRange insertRange)
         {
             editorOperations
                 .InsertTextAsync(scriptFile.DocumentUri.ToString(), textToInsert, insertRange.ToBufferRange())
                 .Wait();
         }
+        #pragma warning restore VSTHRD002
 
         #endregion
 
@@ -232,6 +234,7 @@ public void InsertText(string textToInsert, IFileRange insertRange)
         /// the path where the file should be saved,
         /// including the file name with extension as the leaf
         /// </param>
+        #pragma warning disable VSTHRD002
         public void SaveAs(string newFilePath)
         {
             // Do some validation here so that we can provide a helpful error if the path won't work
@@ -244,8 +247,9 @@ public void SaveAs(string newFilePath)
                 throw new IOException(string.Format("The file '{0}' already exists", absolutePath));
             }
 
-            editorOperations.SaveFileAsync(scriptFile.FilePath, newFilePath);
+            editorOperations.SaveFileAsync(scriptFile.FilePath, newFilePath).Wait();
         }
+        #pragma warning restore VSTHRD002
 
         #endregion
     }
diff --git a/src/PowerShellEditorServices/Hosting/EditorServicesServerFactory.cs b/src/PowerShellEditorServices/Hosting/EditorServicesServerFactory.cs
@@ -83,7 +83,7 @@ public static EditorServicesServerFactory Create(string logPath, int minimumLogL
         /// <param name="inputStream">The protocol transport input stream.</param>
         /// <param name="outputStream">The protocol transport output stream.</param>
         /// <param name="hostStartupInfo">The host details configuration for Editor Services
-        /// instantation.</param>
+        /// instantiation.</param>
         /// <returns>A new, unstarted language server instance.</returns>
         public PsesLanguageServer CreateLanguageServer(
             Stream inputStream,
diff --git a/src/PowerShellEditorServices/Logging/LoggerExtensions.cs b/src/PowerShellEditorServices/Logging/LoggerExtensions.cs
@@ -9,6 +9,7 @@ namespace Microsoft.PowerShell.EditorServices.Logging
 {
     internal static class LoggerExtensions
     {
+        // TODO: These need to be fixed (and used consistently).
         public static void LogException(
             this ILogger logger,
             string message,
diff --git a/src/PowerShellEditorServices/Services/DebugAdapter/DebugService.cs b/src/PowerShellEditorServices/Services/DebugAdapter/DebugService.cs
@@ -559,19 +559,6 @@ public StackFrameDetails[] GetStackFrames()
             }
         }
 
-        internal StackFrameDetails[] GetStackFrames(CancellationToken cancellationToken)
-        {
-            debugInfoHandle.Wait(cancellationToken);
-            try
-            {
-                return stackFrameDetails;
-            }
-            finally
-            {
-                debugInfoHandle.Release();
-            }
-        }
-
         internal async Task<StackFrameDetails[]> GetStackFramesAsync()
         {
             await debugInfoHandle.WaitAsync().ConfigureAwait(false);
diff --git a/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/InvalidPowerShellExpressionException.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/InvalidPowerShellExpressionException.cs
@@ -14,9 +14,10 @@ public class InvalidPowerShellExpressionException : Exception
         /// Initializes a new instance of the SetVariableExpressionException class.
         /// </summary>
         /// <param name="message">Message indicating why the expression is invalid.</param>
-        public InvalidPowerShellExpressionException(string message)
-            : base(message)
-        {
-        }
+        public InvalidPowerShellExpressionException(string message) : base(message) { }
+
+        public InvalidPowerShellExpressionException() { }
+
+        public InvalidPowerShellExpressionException(string message, Exception innerException) : base(message, innerException) { }
     }
 }
diff --git a/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/StackTraceHandler.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/StackTraceHandler.cs
@@ -19,20 +19,19 @@ internal class StackTraceHandler : IStackTraceHandler
 
         public StackTraceHandler(DebugService debugService) => _debugService = debugService;
 
-        public Task<StackTraceResponse> Handle(StackTraceArguments request, CancellationToken cancellationToken)
+        public async Task<StackTraceResponse> Handle(StackTraceArguments request, CancellationToken cancellationToken)
         {
-            StackFrameDetails[] stackFrameDetails =
-                _debugService.GetStackFrames(cancellationToken);
+            StackFrameDetails[] stackFrameDetails = await _debugService.GetStackFramesAsync(cancellationToken).ConfigureAwait(false);
 
             // Handle a rare race condition where the adapter requests stack frames before they've
             // begun building.
-            if (stackFrameDetails == null)
+            if (stackFrameDetails is null)
             {
-                return Task.FromResult(new StackTraceResponse
+                return new StackTraceResponse
                 {
                     StackFrames = Array.Empty<StackFrame>(),
                     TotalFrames = 0
-                });
+                };
             }
 
             List<StackFrame> newStackFrames = new();
@@ -52,19 +51,14 @@ public Task<StackTraceResponse> Handle(StackTraceArguments request, Cancellation
             {
                 // Create the new StackFrame object with an ID that can
                 // be referenced back to the current list of stack frames
-                //newStackFrames.Add(
-                //    StackFrame.Create(
-                //        stackFrameDetails[i],
-                //        i));
-                newStackFrames.Add(
-                    LspDebugUtils.CreateStackFrame(stackFrameDetails[i], id: i));
+                newStackFrames.Add(LspDebugUtils.CreateStackFrame(stackFrameDetails[i], id: i));
             }
 
-            return Task.FromResult(new StackTraceResponse
+            return new StackTraceResponse
             {
                 StackFrames = newStackFrames,
                 TotalFrames = newStackFrames.Count
-            });
+            };
         }
     }
 }
diff --git a/src/PowerShellEditorServices/Services/PowerShell/Debugging/DscBreakpointCapability.cs b/src/PowerShellEditorServices/Services/PowerShell/Debugging/DscBreakpointCapability.cs
@@ -97,7 +97,7 @@ public static Task<DscBreakpointCapability> GetDscCapabilityAsync(
                 return Task.FromResult<DscBreakpointCapability>(null);
             }
 
-            Func<SMA.PowerShell, CancellationToken, DscBreakpointCapability> getDscBreakpointCapabilityFunc = (pwsh, _) =>
+            DscBreakpointCapability getDscBreakpointCapabilityFunc(SMA.PowerShell pwsh, CancellationToken _)
             {
                 PSInvocationSettings invocationSettings = new()
                 {
@@ -159,7 +159,7 @@ public static Task<DscBreakpointCapability> GetDscCapabilityAsync(
                 logger.LogTrace($"DSC resources found: {resourcePaths.Count}");
 
                 return capability;
-            };
+            }
 
             return psesHost.ExecuteDelegateAsync(
                 nameof(getDscBreakpointCapabilityFunc),
diff --git a/src/PowerShellEditorServices/Services/PowerShell/Handlers/GetVersionHandler.cs b/src/PowerShellEditorServices/Services/PowerShell/Handlers/GetVersionHandler.cs
@@ -10,15 +10,15 @@ namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class GetVersionHandler : IGetVersionHandler
     {
-        public async Task<PowerShellVersion> Handle(GetVersionParams request, CancellationToken cancellationToken)
+        public Task<PowerShellVersion> Handle(GetVersionParams request, CancellationToken cancellationToken)
         {
-            return new PowerShellVersion
+            return Task.FromResult(new PowerShellVersion
             {
                 Version = VersionUtils.PSVersionString,
                 Edition = VersionUtils.PSEdition,
                 Commit = VersionUtils.GitCommitId,
                 Architecture = VersionUtils.Architecture
-            };
+            });
         }
     }
 }
diff --git a/src/PowerShellEditorServices/Services/PowerShell/Handlers/PSHostProcessAndRunspaceHandlers.cs b/src/PowerShellEditorServices/Services/PowerShell/Handlers/PSHostProcessAndRunspaceHandlers.cs
@@ -62,10 +62,7 @@ public async Task<RunspaceResponse[]> Handle(GetRunspaceParams request, Cancella
         {
             IEnumerable<PSObject> runspaces = null;
 
-            if (request.ProcessId == null)
-            {
-                request.ProcessId = "current";
-            }
+            request.ProcessId ??= "current";
 
             // If the processId is a valid int, we need to run Get-Runspace within that process
             // otherwise just use the current runspace.
diff --git a/src/PowerShellEditorServices/Services/PowerShell/Utility/CommandHelpers.cs b/src/PowerShellEditorServices/Services/PowerShell/Utility/CommandHelpers.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Linq;
 using System.Management.Automation;
 using System.Threading;
 using System.Threading.Tasks;
@@ -241,7 +242,7 @@ public static async Task<AliasMap> GetAliasesAsync(
                     .AddParameter("CommandType", CommandTypes.Alias),
                 cancellationToken).ConfigureAwait(false);
 
-            foreach (AliasInfo aliasInfo in aliases)
+            foreach (AliasInfo aliasInfo in aliases.Cast<AliasInfo>())
             {
                 // TODO: When we move to netstandard2.1, we can use another overload which generates
                 // static delegates and thus reduces allocations.
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/CodeActionHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/CodeActionHandler.cs
@@ -35,16 +35,7 @@ public PsesCodeActionHandler(ILoggerFactory factory, AnalysisService analysisSer
             CodeActionKinds = new CodeActionKind[] { CodeActionKind.QuickFix }
         };
 
-        // TODO: Either fix or ignore "method lacks 'await'" warning.
-        public override async Task<CodeAction> Handle(CodeAction request, CancellationToken cancellationToken)
-        {
-            // TODO: How on earth do we handle a CodeAction? This is new...
-            if (cancellationToken.IsCancellationRequested)
-            {
-                _logger.LogDebug("CodeAction request canceled for: {Title}", request.Title);
-            }
-            return request;
-        }
+        public override Task<CodeAction> Handle(CodeAction request, CancellationToken cancellationToken) => Task.FromResult(request);
 
         public override async Task<CommandOrCodeActionContainer> Handle(CodeActionParams request, CancellationToken cancellationToken)
         {
diff --git a/src/PowerShellEditorServices/Services/TextDocument/TokenOperations.cs b/src/PowerShellEditorServices/Services/TextDocument/TokenOperations.cs
@@ -136,7 +136,7 @@ internal static FoldingReferenceList FoldableReferences(Token[] tokens)
                     refList.SafeAdd(CreateFoldingReference(blockStartToken, blockNextLine - 1, FoldingRangeKind.Comment));
                     blockStartToken = token;
                 }
-                if (blockStartToken == null) { blockStartToken = token; }
+                blockStartToken ??= token;
                 blockNextLine = thisLine + 1;
             }
 
diff --git a/src/PowerShellEditorServices/Services/Workspace/Handlers/WorkspaceSymbolsHandler.cs b/src/PowerShellEditorServices/Services/Workspace/Handlers/WorkspaceSymbolsHandler.cs
@@ -39,6 +39,7 @@ public override async Task<Container<SymbolInformation>> Handle(WorkspaceSymbolP
 
             foreach (ScriptFile scriptFile in _workspaceService.GetOpenedFiles())
             {
+                _logger.LogDebug($"Handling workspace symbols request for: {request.Query}");
                 IEnumerable<SymbolReference> foundSymbols = _symbolsService.FindSymbolsInFile(scriptFile);
 
                 // TODO: Need to compute a relative path that is based on common path for all workspace files
@@ -89,7 +90,7 @@ public override async Task<Container<SymbolInformation>> Handle(WorkspaceSymbolP
                     });
                 }
             }
-            _logger.LogWarning("Logging in a handler works now.");
+
             return new Container<SymbolInformation>(symbols);
         }
 
diff --git a/src/PowerShellEditorServices/Services/Workspace/RemoteFileManagerService.cs b/src/PowerShellEditorServices/Services/Workspace/RemoteFileManagerService.cs
diff --git a/src/PowerShellEditorServices/Utility/IScriptExtentExtensions.cs b/src/PowerShellEditorServices/Utility/IScriptExtentExtensions.cs
diff --git a/src/PowerShellEditorServices/Utility/PSCommandExtensions.cs b/src/PowerShellEditorServices/Utility/PSCommandExtensions.cs
diff --git a/src/PowerShellEditorServices/Utility/PathUtils.cs b/src/PowerShellEditorServices/Utility/PathUtils.cs
diff --git a/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs b/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs
diff --git a/test/PowerShellEditorServices.Test/Language/TokenOperationsTests.cs b/test/PowerShellEditorServices.Test/Language/TokenOperationsTests.cs
diff --git a/test/PowerShellEditorServices.Test/PsesHostFactory.cs b/test/PowerShellEditorServices.Test/PsesHostFactory.cs

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ public interface ILspCurrentFileContext : IFileContext`
`274`	`274`	`ILspFileRange SelectionRange { get; }`
`275`	`275`	`}`
`276`	`276`
`277`		`- internal struct OmnisharpLspPosition : ILspFilePosition, IEquatable<OmnisharpLspPosition>`
	`277`	`+ internal readonly struct OmnisharpLspPosition : ILspFilePosition, IEquatable<OmnisharpLspPosition>`
`278`	`278`	`{`
`279`	`279`	`private readonly Position _position;`
`280`	`280`
`@@ -287,7 +287,7 @@ internal struct OmnisharpLspPosition : ILspFilePosition, IEquatable<OmnisharpLsp`
`287`	`287`	`public bool Equals(OmnisharpLspPosition other) => _position == other._position;`
`288`	`288`	`}`
`289`	`289`
`290`		`- internal struct OmnisharpLspRange : ILspFileRange, IEquatable<OmnisharpLspRange>`
	`290`	`+ internal readonly struct OmnisharpLspRange : ILspFileRange, IEquatable<OmnisharpLspRange>`
`291`	`291`	`{`
`292`	`292`	`private readonly Range _range;`
`293`	`293`
`@@ -300,7 +300,7 @@ internal struct OmnisharpLspRange : ILspFileRange, IEquatable<OmnisharpLspRange>`
`300`	`300`	`public bool Equals(OmnisharpLspRange other) => _range == other._range;`
`301`	`301`	`}`
`302`	`302`
`303`		`- internal struct BufferFilePosition : IFilePosition, IEquatable<BufferFilePosition>`
	`303`	`+ internal readonly struct BufferFilePosition : IFilePosition, IEquatable<BufferFilePosition>`
`304`	`304`	`{`
`305`	`305`	`private readonly BufferPosition _position;`
`306`	`306`
`@@ -317,7 +317,7 @@ public bool Equals(BufferFilePosition other)`
`317`	`317`	`}`
`318`	`318`	`}`
`319`	`319`
`320`		`- internal struct BufferFileRange : IFileRange, IEquatable<BufferFileRange>`
	`320`	`+ internal readonly struct BufferFileRange : IFileRange, IEquatable<BufferFileRange>`
`321`	`321`	`{`
`322`	`322`	`private readonly BufferRange _range;`
`323`	`323`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,9 @@ internal EditorObject(`
`115`	`115`	`/// at the time this method is invoked.`
`116`	`116`	`/// </summary>`
`117`	`117`	`/// <returns>A instance of the EditorContext class.</returns>`
	`118`	`+ #pragma warning disable VSTHRD002, VSTHRD104`
`118`	`119`	`public EditorContext GetEditorContext() => _editorOperations.GetEditorContextAsync().Result;`
	`120`	`+ #pragma warning restore VSTHRD002, VSTHRD104`
`119`	`121`
`120`	`122`	`internal void SetAsStaticInstance()`
`121`	`123`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ internal EditorWindow(IEditorOperations editorOperations)`
`39`	`39`	`#endregion`
`40`	`40`
`41`	`41`	`#region Public Methods`
	`42`	`+ #pragma warning disable VSTHRD002 // These are public APIs that use async internal methods.`
`42`	`43`
`43`	`44`	`/// <summary>`
`44`	`45`	`/// Shows an informational message to the user.`
`@@ -71,6 +72,7 @@ internal EditorWindow(IEditorOperations editorOperations)`
`71`	`72`	`/// <param name="timeout">A timeout in milliseconds for how long the message should remain visible.</param>`
`72`	`73`	`public void SetStatusBarMessage(string message, int timeout) => editorOperations.SetStatusBarMessageAsync(message, timeout).Wait();`
`73`	`74`
	`75`	`+ #pragma warning restore VSTHRD002`
`74`	`76`	`#endregion`
`75`	`77`	`}`
`76`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public sealed class EditorWorkspace`
`31`	`31`	`#endregion`
`32`	`32`
`33`	`33`	`#region Public Methods`
	`34`	`+ #pragma warning disable VSTHRD002 // These are public APIs that use async internal methods.`
`34`	`35`
`35`	`36`	`/// <summary>`
`36`	`37`	`/// Creates a new file in the editor`
`@@ -53,6 +54,7 @@ public sealed class EditorWorkspace`
`53`	`54`	`/// <param name="preview">Determines wether the file is opened as a preview or as a durable editor.</param>`
`54`	`55`	`public void OpenFile(string filePath, bool preview) => editorOperations.OpenFileAsync(filePath, preview).Wait();`
`55`	`56`
	`57`	`+ #pragma warning restore VSTHRD002`
`56`	`58`	`#endregion`
`57`	`59`	`}`
`58`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -209,12 +209,14 @@ public void InsertText(`
`209`	`209`	`/// </summary>`
`210`	`210`	`/// <param name="textToInsert">The text string to insert.</param>`
`211`	`211`	`/// <param name="insertRange">The buffer range which will be replaced by the string.</param>`
	`212`	`+ #pragma warning disable VSTHRD002`
`212`	`213`	`public void InsertText(string textToInsert, IFileRange insertRange)`
`213`	`214`	`{`
`214`	`215`	`editorOperations`
`215`	`216`	`.InsertTextAsync(scriptFile.DocumentUri.ToString(), textToInsert, insertRange.ToBufferRange())`
`216`	`217`	`.Wait();`
`217`	`218`	`}`
	`219`	`+ #pragma warning restore VSTHRD002`
`218`	`220`
`219`	`221`	`#endregion`
`220`	`222`
`@@ -232,6 +234,7 @@ public void InsertText(string textToInsert, IFileRange insertRange)`
`232`	`234`	`/// the path where the file should be saved,`
`233`	`235`	`/// including the file name with extension as the leaf`
`234`	`236`	`/// </param>`
	`237`	`+ #pragma warning disable VSTHRD002`
`235`	`238`	`public void SaveAs(string newFilePath)`
`236`	`239`	`{`
`237`	`240`	`// Do some validation here so that we can provide a helpful error if the path won't work`
`@@ -244,8 +247,9 @@ public void SaveAs(string newFilePath)`
`244`	`247`	`throw new IOException(string.Format("The file '{0}' already exists", absolutePath));`
`245`	`248`	`}`
`246`	`249`
`247`		`- editorOperations.SaveFileAsync(scriptFile.FilePath, newFilePath);`
	`250`	`+ editorOperations.SaveFileAsync(scriptFile.FilePath, newFilePath).Wait();`
`248`	`251`	`}`
	`252`	`+ #pragma warning restore VSTHRD002`
`249`	`253`
`250`	`254`	`#endregion`
`251`	`255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ namespace Microsoft.PowerShell.EditorServices.Logging`
`9`	`9`	`{`
`10`	`10`	`internal static class LoggerExtensions`
`11`	`11`	`{`
	`12`	`+ // TODO: These need to be fixed (and used consistently).`
`12`	`13`	`public static void LogException(`
`13`	`14`	`this ILogger logger,`
`14`	`15`	`string message,`
Original file line number	Diff line number	Diff line change
`@@ -559,19 +559,6 @@ public StackFrameDetails[] GetStackFrames()`
`559`	`559`	`}`
`560`	`560`	`}`
`561`	`561`
`562`		`- internal StackFrameDetails[] GetStackFrames(CancellationToken cancellationToken)`
`563`		`- {`
`564`		`- debugInfoHandle.Wait(cancellationToken);`
`565`		`- try`
`566`		`- {`
`567`		`- return stackFrameDetails;`
`568`		`- }`
`569`		`- finally`
`570`		`- {`
`571`		`- debugInfoHandle.Release();`
`572`		`- }`
`573`		`- }`
`574`		`-`
`575`	`562`	`internal async Task<StackFrameDetails[]> GetStackFramesAsync()`
`576`	`563`	`{`
`577`	`564`	`await debugInfoHandle.WaitAsync().ConfigureAwait(false);`
Original file line number	Diff line number	Diff line change
`@@ -19,20 +19,19 @@ internal class StackTraceHandler : IStackTraceHandler`
`19`	`19`
`20`	`20`	`public StackTraceHandler(DebugService debugService) => _debugService = debugService;`
`21`	`21`
`22`		`- public Task<StackTraceResponse> Handle(StackTraceArguments request, CancellationToken cancellationToken)`
	`22`	`+ public async Task<StackTraceResponse> Handle(StackTraceArguments request, CancellationToken cancellationToken)`
`23`	`23`	`{`
`24`		`- StackFrameDetails[] stackFrameDetails =`
`25`		`- _debugService.GetStackFrames(cancellationToken);`
	`24`	`+ StackFrameDetails[] stackFrameDetails = await _debugService.GetStackFramesAsync(cancellationToken).ConfigureAwait(false);`
`26`	`25`
`27`	`26`	`// Handle a rare race condition where the adapter requests stack frames before they've`
`28`	`27`	`// begun building.`
`29`		`- if (stackFrameDetails == null)`
	`28`	`+ if (stackFrameDetails is null)`
`30`	`29`	`{`
`31`		`- return Task.FromResult(new StackTraceResponse`
	`30`	`+ return new StackTraceResponse`
`32`	`31`	`{`
`33`	`32`	`StackFrames = Array.Empty<StackFrame>(),`
`34`	`33`	`TotalFrames = 0`
`35`		`- });`
	`34`	`+ };`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`List<StackFrame> newStackFrames = new();`
`@@ -52,19 +51,14 @@ public Task<StackTraceResponse> Handle(StackTraceArguments request, Cancellation`
`52`	`51`	`{`
`53`	`52`	`// Create the new StackFrame object with an ID that can`
`54`	`53`	`// be referenced back to the current list of stack frames`
`55`		`- //newStackFrames.Add(`
`56`		`- // StackFrame.Create(`
`57`		`- // stackFrameDetails[i],`
`58`		`- // i));`
`59`		`- newStackFrames.Add(`
`60`		`- LspDebugUtils.CreateStackFrame(stackFrameDetails[i], id: i));`
	`54`	`+ newStackFrames.Add(LspDebugUtils.CreateStackFrame(stackFrameDetails[i], id: i));`
`61`	`55`	`}`
`62`	`56`
`63`		`- return Task.FromResult(new StackTraceResponse`
	`57`	`+ return new StackTraceResponse`
`64`	`58`	`{`
`65`	`59`	`StackFrames = newStackFrames,`
`66`	`60`	`TotalFrames = newStackFrames.Count`
`67`		`- });`
	`61`	`+ };`
`68`	`62`	`}`
`69`	`63`	`}`
`70`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public static Task<DscBreakpointCapability> GetDscCapabilityAsync(`
`97`	`97`	`return Task.FromResult<DscBreakpointCapability>(null);`
`98`	`98`	`}`
`99`	`99`
`100`		`- Func<SMA.PowerShell, CancellationToken, DscBreakpointCapability> getDscBreakpointCapabilityFunc = (pwsh, _) =>`
	`100`	`+ DscBreakpointCapability getDscBreakpointCapabilityFunc(SMA.PowerShell pwsh, CancellationToken _)`
`101`	`101`	`{`
`102`	`102`	`PSInvocationSettings invocationSettings = new()`
`103`	`103`	`{`
`@@ -159,7 +159,7 @@ public static Task<DscBreakpointCapability> GetDscCapabilityAsync(`
`159`	`159`	`logger.LogTrace($"DSC resources found: {resourcePaths.Count}");`
`160`	`160`
`161`	`161`	`return capability;`
`162`		`- };`
	`162`	`+ }`
`163`	`163`
`164`	`164`	`return psesHost.ExecuteDelegateAsync(`
`165`	`165`	`nameof(getDscBreakpointCapabilityFunc),`
Original file line number	Diff line number	Diff line change
`@@ -10,15 +10,15 @@ namespace Microsoft.PowerShell.EditorServices.Handlers`
`10`	`10`	`{`
`11`	`11`	`internal class GetVersionHandler : IGetVersionHandler`
`12`	`12`	`{`
`13`		`- public async Task<PowerShellVersion> Handle(GetVersionParams request, CancellationToken cancellationToken)`
	`13`	`+ public Task<PowerShellVersion> Handle(GetVersionParams request, CancellationToken cancellationToken)`
`14`	`14`	`{`
`15`		`- return new PowerShellVersion`
	`15`	`+ return Task.FromResult(new PowerShellVersion`
`16`	`16`	`{`
`17`	`17`	`Version = VersionUtils.PSVersionString,`
`18`	`18`	`Edition = VersionUtils.PSEdition,`
`19`	`19`	`Commit = VersionUtils.GitCommitId,`
`20`	`20`	`Architecture = VersionUtils.Architecture`
`21`		`- };`
	`21`	`+ });`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`}`