From 3808f11785780b7d084bb100dd351998f94c0411 Mon Sep 17 00:00:00 2001 From: Keith Hill Date: Sun, 3 Mar 2019 14:35:50 -0700 Subject: [PATCH 1/4] Return the start line number for Describe block Supports PR 1776 in vscode-powershell --- .../CodeLens/PesterCodeLensProvider.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/PowerShellEditorServices.Host/CodeLens/PesterCodeLensProvider.cs b/src/PowerShellEditorServices.Host/CodeLens/PesterCodeLensProvider.cs index 619ca0a49..57d51b57a 100644 --- a/src/PowerShellEditorServices.Host/CodeLens/PesterCodeLensProvider.cs +++ b/src/PowerShellEditorServices.Host/CodeLens/PesterCodeLensProvider.cs @@ -54,7 +54,11 @@ 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, + pesterSymbol.ScriptRegion.StartLineNumber })), new CodeLens( this, @@ -63,7 +67,11 @@ 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, + pesterSymbol.ScriptRegion.StartLineNumber })), }; return codeLensResults; From bba3db2a965a2bf6e17e9640faab3a87f868bcf3 Mon Sep 17 00:00:00 2001 From: Keith Hill Date: Mon, 4 Mar 2019 11:52:06 -0700 Subject: [PATCH 2/4] Null check pesterSymbol.ScriptRegion --- .../CodeLens/PesterCodeLensProvider.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PowerShellEditorServices.Host/CodeLens/PesterCodeLensProvider.cs b/src/PowerShellEditorServices.Host/CodeLens/PesterCodeLensProvider.cs index 57d51b57a..6c24f0975 100644 --- a/src/PowerShellEditorServices.Host/CodeLens/PesterCodeLensProvider.cs +++ b/src/PowerShellEditorServices.Host/CodeLens/PesterCodeLensProvider.cs @@ -58,7 +58,7 @@ private CodeLens[] GetPesterLens( scriptFile.ClientFilePath, false /* No debug */, pesterSymbol.TestName, - pesterSymbol.ScriptRegion.StartLineNumber })), + pesterSymbol.ScriptRegion?.StartLineNumber })), new CodeLens( this, @@ -71,7 +71,7 @@ private CodeLens[] GetPesterLens( scriptFile.ClientFilePath, true /* Run in debugger */, pesterSymbol.TestName, - pesterSymbol.ScriptRegion.StartLineNumber })), + pesterSymbol.ScriptRegion?.StartLineNumber })), }; return codeLensResults; From 2b0f195551f0d3d0ceb6ce2993b314fdd4b3b323 Mon Sep 17 00:00:00 2001 From: Keith Hill Date: Mon, 4 Mar 2019 18:22:23 -0700 Subject: [PATCH 3/4] Update comment to cause new build to kick off --- .../CodeLens/PesterCodeLensProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PowerShellEditorServices.Host/CodeLens/PesterCodeLensProvider.cs b/src/PowerShellEditorServices.Host/CodeLens/PesterCodeLensProvider.cs index 6c24f0975..02fafb1ed 100644 --- a/src/PowerShellEditorServices.Host/CodeLens/PesterCodeLensProvider.cs +++ b/src/PowerShellEditorServices.Host/CodeLens/PesterCodeLensProvider.cs @@ -69,7 +69,7 @@ private CodeLens[] GetPesterLens( "Debug tests", new object[] { scriptFile.ClientFilePath, - true /* Run in debugger */, + true /* Run in the debugger */, pesterSymbol.TestName, pesterSymbol.ScriptRegion?.StartLineNumber })), }; From 0728c55974a80d5da93de7b423898338b84a68ed Mon Sep 17 00:00:00 2001 From: Keith Hill Date: Mon, 4 Mar 2019 20:16:29 -0700 Subject: [PATCH 4/4] Whitespace change to kick off a new build --- .../CodeLens/PesterCodeLensProvider.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/PowerShellEditorServices.Host/CodeLens/PesterCodeLensProvider.cs b/src/PowerShellEditorServices.Host/CodeLens/PesterCodeLensProvider.cs index 02fafb1ed..e814918ab 100644 --- a/src/PowerShellEditorServices.Host/CodeLens/PesterCodeLensProvider.cs +++ b/src/PowerShellEditorServices.Host/CodeLens/PesterCodeLensProvider.cs @@ -41,9 +41,7 @@ public PesterCodeLensProvider(EditorSession editorSession) /// The Pester symbol to get CodeLenses for. /// The script file the Pester symbol comes from. /// All CodeLenses for the given Pester symbol. - private CodeLens[] GetPesterLens( - PesterSymbolReference pesterSymbol, - ScriptFile scriptFile) + private CodeLens[] GetPesterLens(PesterSymbolReference pesterSymbol, ScriptFile scriptFile) { var codeLensResults = new CodeLens[] { @@ -107,9 +105,7 @@ public CodeLens[] ProvideCodeLenses(ScriptFile scriptFile) /// The code lens to resolve. /// /// The given CodeLens, wrapped in a task. - public Task ResolveCodeLensAsync( - CodeLens codeLens, - CancellationToken cancellationToken) + public Task ResolveCodeLensAsync(CodeLens codeLens, CancellationToken cancellationToken) { // This provider has no specific behavior for // resolving CodeLenses.