Commitb502098

and

authored

Fix the common parameter-ProgressAction for advanced functions (#24591)

Co-authored-by: Dongbo Wang <dongbow@microsoft.com>

1 parent4e03546 commitb502098Copy full SHA for b502098

File tree

+49

-1

lines changed

docs/community
- working-group-definitions.md
src/System.Management.Automation/engine
- SpecialVariables.cs
- parser
  - Compiler.cs
test/powershell/Language/Scripting
- CommonParameters.Tests.ps1

+49

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ The PowerShell developer experience includes the development of modules (in`
`30`	`30`	`as well as the experience ofhosting PowerShell and its APIs in other applications and language runtimes.`
`31`	`31`	`Special consideration should be given to topics likebackwards compatibility with Windows PowerShell`
`32`	`32`	`(e.g. withPowerShell Standard) andintegration with related developer tools`
`33`		`-(e.g. .NET CLI or the PowerShell extension forVS Code).`
	`33`	`+(e.g. .NET CLI or the PowerShell extension forVisual Studio Code).`
`34`	`34`
`35`	`35`	`###Members`
`36`	`36`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -341,6 +341,7 @@ internal static class SpecialVariables`
`341`	`341`	`SpecialVariables.WarningPreference,`
`342`	`342`	`SpecialVariables.InformationPreference,`
`343`	`343`	`SpecialVariables.ConfirmPreference,`
	`344`	`+SpecialVariables.ProgressPreference,`
`344`	`345`	`};`
`345`	`346`
`346`	`347`	`internalstaticreadonlyType[]PreferenceVariableTypes=`
`@@ -352,6 +353,7 @@ internal static class SpecialVariables`
`352`	`353`	`/* WarningPreference */typeof(ActionPreference),`
`353`	`354`	`/* InformationPreference */typeof(ActionPreference),`
`354`	`355`	`/* ConfirmPreference */typeof(ConfirmImpact),`
	`356`	`+/* ProgressPreference */typeof(ActionPreference),`
`355`	`357`	`};`
`356`	`358`
`357`	`359`	`// The following variables are created in every session w/ AllScope. We avoid creating local slots when we`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -833,6 +833,14 @@ internal class Compiler : ICustomAstVisitor2`
`833`	`833`
`834`	`834`	`staticCompiler()`
`835`	`835`	`{`
	`836`	`+Diagnostics.Assert(SpecialVariables.AutomaticVariables.Length==(int)AutomaticVariable.NumberOfAutomaticVariables`
	`837`	`+&&SpecialVariables.AutomaticVariableTypes.Length==(int)AutomaticVariable.NumberOfAutomaticVariables,`
	`838`	`+"The 'AutomaticVariable' enum length does not match both 'AutomaticVariables' and 'AutomaticVariableTypes' length.");`
	`839`	`+`
	`840`	`+Diagnostics.Assert(Enum.GetNames(typeof(PreferenceVariable)).Length==SpecialVariables.PreferenceVariables.Length`
	`841`	`+&&Enum.GetNames(typeof(PreferenceVariable)).Length==SpecialVariables.PreferenceVariableTypes.Length,`
	`842`	`+"The 'PreferenceVariable' enum length does not match both 'PreferenceVariables' and 'PreferenceVariableTypes' length.");`
	`843`	`+`
`836`	`844`	`s_functionContext=Expression.Parameter(typeof(FunctionContext),"funcContext");`
`837`	`845`	`s_executionContextParameter=Expression.Variable(typeof(ExecutionContext),"context");`
`838`	`846`

Lines changed: 38 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,44 @@ Describe "Common parameters support for script cmdlets" -Tags "CI" {`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
	`150`	`+ Context"ProgressAction" {`
	`151`	`+ It"Ignores progress actions on advanced script function with no variables" {`
	`152`	`+$ps.AddScript(`
	`153`	`+@'`
	`154`	`+function test-function {`
	`155`	`+ [CmdletBinding()]param()`
	`156`	`+`
	`157`	`+ Write-Progress "progress foo"`
	`158`	`+}`
	`159`	`+test-function -ProgressAction Ignore`
	`160`	`+'@).Invoke()`
	`161`	`+`
	`162`	`+$ps.Streams.Progress.Count\| Should-Be0`
	`163`	`+$ps.Streams.Error\|ForEach-Object {`
	`164`	`+Write-Error-ErrorRecord$_-ErrorAction Stop`
	`165`	`+ }`
	`166`	`+ }`
	`167`	`+`
	`168`	`+ It"Ignores progress actions on advanced script function with variables" {`
	`169`	`+$ps.AddScript(`
	`170`	`+@'`
	`171`	`+function test-function {`
	`172`	`+ [CmdletBinding()]param([string]$path)`
	`173`	`+`
	`174`	`+ switch($false) { default { "echo $path" } }`
	`175`	`+`
	`176`	`+ Write-Progress "progress foo"`
	`177`	`+}`
	`178`	`+test-function -ProgressAction Ignore`
	`179`	`+'@).Invoke()`
	`180`	`+`
	`181`	`+$ps.Streams.Progress.Count\| Should-Be0`
	`182`	`+$ps.Streams.Error\|ForEach-Object {`
	`183`	`+Write-Error-ErrorRecord$_-ErrorAction Stop`
	`184`	`+ }`
	`185`	`+ }`
	`186`	`+ }`
	`187`	`+`
`150`	`188`	`Context"SupportShouldprocess" {`
`151`	`189`	`$script='`
`152`	`190`	`function get-foo`

Comments

(0)