Send Pester describe line and info whether Pester 4.6.0 is installed to PowerShell.RunPesterTests command

src/PowerShellEditorServices.Host/CodeLens/CodeLensFeature.cs

@@ -8,8 +8,6 @@
 using Microsoft.PowerShell.EditorServices.Protocol.MessageProtocol;
 using Microsoft.PowerShell.EditorServices.Utility;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -99,11 +97,11 @@ private CodeLensFeature(
         /// </summary>
         /// <param name="scriptFile">The PowerShell script file to get CodeLenses for.</param>
         /// <returns>All generated CodeLenses for the given script file.</returns>
-        public CodeLens[] ProvideCodeLenses(ScriptFile scriptFile)
+        public async Task<CodeLens[]> ProvideCodeLenses(ScriptFile scriptFile)
         {
-            return InvokeProviders(provider => provider.ProvideCodeLenses(scriptFile))
-                .SelectMany(codeLens => codeLens)
-                .ToArray();
+            var providers = await Task.WhenAll(InvokeProviders(async provider => await provider.ProvideCodeLenses(scriptFile)));
+            return providers.SelectMany(codeLens => codeLens)
+                            .ToArray();
         }
 
         /// <summary>
@@ -118,7 +116,7 @@ private async Task HandleCodeLensRequestAsync(
             ScriptFile scriptFile = _editorSession.Workspace.GetFile(
                 codeLensParams.TextDocument.Uri);
 
-            CodeLens[] codeLensResults = ProvideCodeLenses(scriptFile);
+            CodeLens[] codeLensResults = await ProvideCodeLenses(scriptFile);
 
             var codeLensResponse = new LanguageServer.CodeLens[codeLensResults.Length];
             for (int i = 0; i < codeLensResults.Length; i++)

src/PowerShellEditorServices.Host/CodeLens/PesterCodeLensProvider.cs

@@ -8,6 +8,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Management.Automation;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -25,6 +26,12 @@ internal class PesterCodeLensProvider : FeatureProviderBase, ICodeLensProvider
         /// </summary>
         private IDocumentSymbolProvider _symbolProvider;
 
+        /// <summary>
+        /// Pester 4.6.0 introduced a new ScriptblockFilter parameter to be able to run a test based on a line,
+        /// therefore knowing this information is important.
+        /// </summary>
+        private readonly Lazy<Task<bool>> _pesterV4_6_0_OrHigherAvailable;
+
         /// <summary>
         /// Create a new Pester CodeLens provider for a given editor session.
         /// </summary>
@@ -33,6 +40,7 @@ public PesterCodeLensProvider(EditorSession editorSession)
         {
             _editorSession = editorSession;
             _symbolProvider = new PesterDocumentSymbolProvider();
+            _pesterV4_6_0_OrHigherAvailable = new Lazy<Task<bool>>(async () => await DeterminePesterVersion());
         }
 
         /// <summary>
@@ -41,10 +49,13 @@ public PesterCodeLensProvider(EditorSession editorSession)
         /// <param name="pesterSymbol">The Pester symbol to get CodeLenses for.</param>
         /// <param name="scriptFile">The script file the Pester symbol comes from.</param>
         /// <returns>All CodeLenses for the given Pester symbol.</returns>
-        private CodeLens[] GetPesterLens(
+        private async Task<CodeLens[]> GetPesterLens(
             PesterSymbolReference pesterSymbol,
             ScriptFile scriptFile)
         {
+            // A value of null is a signal to PSES that the available Pester version does not support
+            // running Describe blocks by name (the test name will used instead then).
+            int? describeBlockLineNumber = await _pesterV4_6_0_OrHigherAvailable.Value ? (int?)pesterSymbol.ScriptRegion.StartLineNumber : null;
             var codeLensResults = new CodeLens[]
             {
                 new CodeLens(
@@ -54,7 +65,7 @@ private CodeLens[] GetPesterLens(
                     new ClientCommand(
                         "PowerShell.RunPesterTests",
                         "Run tests",
-                        new object[] { scriptFile.ClientFilePath, false /* No debug */, pesterSymbol.TestName })),
+                        new object[] { scriptFile.ClientFilePath, false /* No debug */, pesterSymbol.TestName, describeBlockLineNumber })),
 
                 new CodeLens(
                     this,
@@ -63,18 +74,45 @@ private CodeLens[] GetPesterLens(
                     new ClientCommand(
                         "PowerShell.RunPesterTests",
                         "Debug tests",
-                        new object[] { scriptFile.ClientFilePath, true /* Run in debugger */, pesterSymbol.TestName })),
+                        new object[] { scriptFile.ClientFilePath, true /* Run in debugger */, pesterSymbol.TestName, describeBlockLineNumber })),
             };
 
             return codeLensResults;
         }
 
+        /// <summary>
+        /// Used to determine the value of <see cref="_pesterV4_6_0_OrHigherAvailable"/> as a background task.
+        /// </summary>
+        private async Task<bool> DeterminePesterVersion()
+        {
+            var powerShell = new PSCommand()
+                .AddCommand("Get-Command")
+                .AddParameter("Name", "Invoke-Pester");
+
+            IEnumerable<PSObject> result = await _editorSession.PowerShellContext.ExecuteCommandAsync<PSObject>(powerShell);
+            var pesterCommand = result.FirstOrDefault();
+            if (pesterCommand == null)
+            {
+                return false;
+            }
+
+            if (pesterCommand.BaseObject is FunctionInfo invokePesterFunction)
+            {
+                var pesterVersion = invokePesterFunction.Version;
+                if (pesterVersion.Major >= 4 && pesterVersion.Minor >= 6)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
         /// <summary>
         /// Get all Pester CodeLenses for a given script file.
         /// </summary>
         /// <param name="scriptFile">The script file to get Pester CodeLenses for.</param>
         /// <returns>All Pester CodeLenses for the given script file.</returns>
-        public CodeLens[] ProvideCodeLenses(ScriptFile scriptFile)
+        public async Task<CodeLens[]> ProvideCodeLenses(ScriptFile scriptFile)
         {
             var lenses = new List<CodeLens>();
             foreach (SymbolReference symbol in _symbolProvider.ProvideDocumentSymbols(scriptFile))
@@ -86,7 +124,7 @@ public CodeLens[] ProvideCodeLenses(ScriptFile scriptFile)
                         continue;
                     }
 
-                    lenses.AddRange(GetPesterLens(pesterSymbol, scriptFile));
+                    lenses.AddRange(await GetPesterLens(pesterSymbol, scriptFile));
                 }
             }
 

src/PowerShellEditorServices.Host/CodeLens/ReferencesCodeLensProvider.cs

@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -50,7 +49,7 @@ public ReferencesCodeLensProvider(EditorSession editorSession)
         /// </summary>
         /// <param name="scriptFile">The PowerShell script file to get code lenses for.</param>
         /// <returns>An array of CodeLenses describing all functions in the given script file.</returns>
-        public CodeLens[] ProvideCodeLenses(ScriptFile scriptFile)
+        public async Task<CodeLens[]> ProvideCodeLenses(ScriptFile scriptFile)
         {
             var acc = new List<CodeLens>();
             foreach (SymbolReference sym in _symbolProvider.ProvideDocumentSymbols(scriptFile))

src/PowerShellEditorServices/CodeLenses/ICodeLensProvider.cs

@@ -3,9 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.PowerShell.EditorServices.Utility;
-using System.Collections.Generic;
-using System.Management.Automation.Language;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -24,7 +21,7 @@ public interface ICodeLensProvider : IFeatureProvider
         /// The document for which CodeLenses should be provided.
         /// </param>
         /// <returns>An array of CodeLenses.</returns>
-        CodeLens[] ProvideCodeLenses(ScriptFile scriptFile);
+        Task<CodeLens[]> ProvideCodeLenses(ScriptFile scriptFile);
 
         /// <summary>
         /// Resolves a CodeLens that was created without a Command.

src/PowerShellEditorServices/CodeLenses/ICodeLenses.cs

@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Collections.Generic;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace Microsoft.PowerShell.EditorServices.CodeLenses
@@ -29,6 +27,6 @@ public interface ICodeLenses
         /// The document for which CodeLenses should be provided.
         /// </param>
         /// <returns>An array of CodeLenses.</returns>
-        CodeLens[] ProvideCodeLenses(ScriptFile scriptFile);
+        Task<CodeLens[]> ProvideCodeLenses(ScriptFile scriptFile);
     }
 }