Get tests passing with PowerShell 7.4

Author: andyleejordan

src/PowerShellEditorServices/Utility/VersionUtils.cs

@@ -43,10 +43,15 @@ internal static class VersionUtils
         public static bool IsPS5 { get; } = PSVersion.Major == 5;
 
         /// <summary>
-        /// True if we are running in PowerShell 7, false otherwise.
+        /// True if we are running in PowerShell 7 or greater, false otherwise.
         /// </summary>
         public static bool IsPS7OrGreater { get; } = PSVersion.Major >= 7;
 
+        /// <summary>
+        /// True if we are running in PowerShell 7.4, false otherwise.
+        /// </summary>
+        public static bool IsPS74 { get; } = PSVersion.Major == 7 && PSVersion.Minor == 4;
+
         /// <summary>
         /// True if we are running on Windows, false otherwise.
         /// </summary>

test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs

@@ -106,10 +106,12 @@ PowerShellVersion details
             if (PwshExe == "powershell")
             {
                 Assert.Equal("Desktop", details.Edition);
+                Assert.StartsWith("5", details.Version);
             }
             else
             {
                 Assert.Equal("Core", details.Edition);
+                Assert.StartsWith("7", details.Version);
             }
         }
 
@@ -1060,7 +1062,14 @@ public async Task CanSendCompletionAndCompletionResolveRequestAsync()
         [SkippableFact]
         public async Task CanRequestCompletionsAndHandleExceptions()
         {
-            Skip.If(PsesStdioProcess.IsWindowsPowerShell, "This is a temporary bug in PowerShell 7, the fix is making its way upstream.");
+            PowerShellVersion details
+                = await PsesLanguageClient
+                    .SendRequest("powerShell/getVersion", new GetVersionParams())
+                    .Returning<PowerShellVersion>(CancellationToken.None);
+
+            Skip.IfNot(details.Version.StartsWith("7.2") || details.Version.StartsWith("7.3"),
+                "This is a bug in PowerShell 7.2 and 7.3, fixed in 7.4");
+
             string filePath = NewTestFile(@"
 @() | ForEach-Object {
     if ($false) {

test/PowerShellEditorServices.Test.E2E/Processes/PsesStdioProcess.cs

@@ -11,7 +11,7 @@
 namespace PowerShellEditorServices.Test.E2E
 {
     /// <summary>
-    ///     A <see cref="ServerProcess"/> is responsible for launching or attaching to a language server, providing access to its input and output streams, and tracking its lifetime.
+    /// A <see cref="ServerProcess"/> is responsible for launching or attaching to a language server, providing access to its input and output streams, and tracking its lifetime.
     /// </summary>
     public class PsesStdioProcess : StdioServerProcess
     {
@@ -21,17 +21,14 @@ public class PsesStdioProcess : StdioServerProcess
         #region private static or constants members
 
         private static readonly string s_bundledModulePath = new FileInfo(Path.Combine(
-            s_binDir,
-            "..", "..", "..", "..", "..",
-            "module")).FullName;
+            s_binDir, "..", "..", "..", "..", "..", "module")).FullName;
 
         private static readonly string s_sessionDetailsPath = Path.Combine(
-            s_binDir,
-            $"pses_test_sessiondetails_{Path.GetRandomFileName()}");
+            s_binDir, $"pses_test_sessiondetails_{Path.GetRandomFileName()}");
 
         private static readonly string s_logPath = Path.Combine(
-            Environment.GetEnvironmentVariable("BUILD_ARTIFACTSTAGINGDIRECTORY") ?? s_binDir,
-            $"pses_test_logs_{Path.GetRandomFileName()}");
+            s_binDir, $"pses_test_logs_{Path.GetRandomFileName()}");
+
         private const string s_logLevel = "Diagnostic";
         private static readonly string[] s_featureFlags = { "PSReadLine" };
         private const string s_hostName = "TestHost";

test/PowerShellEditorServices.Test.Shared/Completion/CompleteVariableInFile.cs

@@ -21,7 +21,9 @@ internal static class CompleteVariableInFile
         public static readonly CompletionItem ExpectedCompletion = new()
         {
             Kind = CompletionItemKind.Variable,
-            Detail = "", // Same as label, so not shown.
+            // PowerShell 7.4 now lights up a type for the detail, otherwise it's the same as the
+            // label and therefore hidden.
+            Detail = Utility.VersionUtils.IsPS74 ? "[string]" : "",
             FilterText = "$testVar1",
             InsertText = "$testVar1",
             Label = "testVar1",

test/PowerShellEditorServices.Test/Language/CompletionHandlerTests.cs

@@ -109,9 +109,10 @@ public async Task CompletesVariableInFile()
             Assert.Equal(CompleteVariableInFile.ExpectedCompletion, actual);
         }
 
-        [Fact]
+        [SkippableFact]
         public async Task CompletesAttributeValue()
         {
+            Skip.If(VersionUtils.IsPS74, "PowerShell 7.4 isn't returning these!");
             (_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteAttributeValue.SourceDetails);
             // NOTE: Since the completions come through un-ordered from PowerShell, their SortText
             // (which has an index prepended from the original order) will mis-match our assumed