Commitc7acd5e

committed

Clear-Variable - Support Scope parameter.

Also fix a bug in the PSVariableIntrinsics.SetAtScope which was notusing the correct scope.

1 parent2291fe1 commitc7acd5eCopy full SHA for c7acd5e

File tree

+39

-6

lines changed

+39

-6

lines changed

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,9 @@ public sealed class ClearVariableCommand : VariableCommandBase`
`24`	`24`	`[Parameter]`
`25`	`25`	`publicSwitchParameterPassThru{get;set;}`
`26`	`26`
	`27`	`+[ParameterAttribute]`
	`28`	`+publicstringScope{get;set;}`
	`29`	`+`
`27`	`30`	`publicClearVariableCommand()`
`28`	`31`	`{`
`29`	`32`	`// MUST: take these out into the base`
`@@ -33,13 +36,11 @@ public ClearVariableCommand()`
`33`	`36`
`34`	`37`	`protectedoverridevoidProcessRecord()`
`35`	`38`	`{`
`36`		`-// TODO: deal with scope`
`37`	`39`	`// TODO: deal with ShouldProcess`
`38`		`-// TODO: deal with read-only variables`
`39`	`40`
`40`	`41`	`foreach(stringnameinName)`
`41`	`42`	`{`
`42`		`-PSVariablevariable=SessionState.PSVariable.Get(name);`
	`43`	`+PSVariablevariable=SessionState.PSVariable.GetAtScope(name,Scope);`
`43`	`44`
`44`	`45`	`if(variable==null)`
`45`	`46`	`{`
`@@ -51,7 +52,7 @@ protected override void ProcessRecord()`
`51`	`52`	`{`
`52`	`53`	`CheckVariableCanBeChanged(variable);`
`53`	`54`	`variable.Value=null;`
`54`		`-SessionState.PSVariable.Set(variable,Force);`
	`55`	`+SessionState.PSVariable.SetAtScope(variable,Scope,Force);`
`55`	`56`	`}`
`56`	`57`	`catch(SessionStateExceptionex)`
`57`	`58`	`{`

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -196,5 +196,31 @@ public void TryToClearConstantVariableWithForce()`
`196`	`196`	`ErrorRecorderror=ReferenceHost.GetLastRawErrorRecords().Single();`
`197`	`197`	`Assert.AreEqual("Cannot overwrite variable foo because it is read-only or constant.",error.Exception.Message);`
`198`	`198`	`}`
	`199`	`+`
	`200`	`+[Test]`
	`201`	`+publicvoidClearLocalScopeVariable()`
	`202`	`+{`
	`203`	`+stringresult=ReferenceHost.Execute(newstring[]{`
	`204`	`+"$test = 'test-global'",`
	`205`	`+"function foo { $test = 'test-local'; Clear-Variable test -Scope local; return $test; }",`
	`206`	`+"$a = foo",`
	`207`	`+"($a -eq $null).ToString() + ', ' + $test"`
	`208`	`+});`
	`209`	`+`
	`210`	`+Assert.AreEqual("True, test-global"+Environment.NewLine,result);`
	`211`	`+}`
	`212`	`+`
	`213`	`+[Test]`
	`214`	`+publicvoidClearGlobalScopeVariable()`
	`215`	`+{`
	`216`	`+stringresult=ReferenceHost.Execute(newstring[]{`
	`217`	`+"$test = 'test-global'",`
	`218`	`+"function foo { $test = 'test-local'; Clear-Variable test -Scope global; return $test; }",`
	`219`	`+"$a = foo",`
	`220`	`+"$a + ', ' + ($test -eq $null).ToString()"`
	`221`	`+});`
	`222`	`+`
	`223`	`+Assert.AreEqual("test-local, True"+Environment.NewLine,result);`
	`224`	`+}`
`199`	`225`	`}`
`200`	`226`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ internal void SetAtScope(PSVariable variable, string scope, bool force = false)`
`79`	`79`	`thrownewArgumentNullException("The variable is null.");`
`80`	`80`	`}`
`81`	`81`
`82`		`-varoriginal=_intrinsics.Scope.GetLocal(variable.Name);`
	`82`	`+varoriginal=_intrinsics.Scope.GetAtScope(variable.Name,scope);`
`83`	`83`	`if(original==null)`
`84`	`84`	`{`
`85`	`85`	`_intrinsics.Scope.SetAtScope(variable,scope,true);`
`@@ -89,7 +89,7 @@ internal void SetAtScope(PSVariable variable, string scope, bool force = false)`
`89`	`89`	`original.Value=variable.Value;`
`90`	`90`	`original.Description=variable.Description;`
`91`	`91`	`original.Options=variable.Options;`
`92`		`-_intrinsics.Scope.SetLocal(original,true,force);`
	`92`	`+_intrinsics.Scope.SetAtScope(original,scope,true,force);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`publicvoidSet(stringname,objectvalue)`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,12 @@ public void SetAtScope(T value, string scope, bool overwrite)`
`229`	`229`	`affectedScope.SetLocal(value,overwrite);`
`230`	`230`	`}`
`231`	`231`
	`232`	`+internalvoidSetAtScope(Tvalue,stringscope,booloverwrite,boolforce)`
	`233`	`+{`
	`234`	`+varaffectedScope=GetScope(scope,true,this);`
	`235`	`+affectedScope.SetLocal(value,overwrite,force);`
	`236`	`+}`
	`237`	`+`
`232`	`238`	`publicvoidRemoveAtScope(stringname,stringscope)`
`233`	`239`	`{`
`234`	`240`	`varaffectedScope=GetScope(scope,true,this);`

Comments

(0)