Win7/PowerShell7
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Pass the 'Match' object to $_ for the substitute script block in '-replace' operation (#6029)

Browse Source
This commit is contained in:
Dongbo Wang 2018-03-12 17:53:09 -07:00
parent 915639a177
commit 7721042fd5
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/System.Management.Automation/engine/lang/parserutils.cs
View File

@ -895,14 +895,13 @@ namespace System.Management.Automation
"BadReplaceArgument", ParserStrings.BadReplaceArgument, ignoreCase ? "-ireplace" : "-replace", rList.Count);
}
if(rList.Count > 1)
{
substitute = rList[1];
}
if (rList.Count > 0)
{
pattern = rList[0];
if (rList.Count > 1)
{
substitute = rList[1];
}
}
}
else
@ -963,14 +962,29 @@ namespace System.Management.Automation
/// <returns>The result of the regex.Replace operation</returns>
private static object ReplaceOperatorImpl(ExecutionContext context, string input, Regex regex, object substitute)
{
MatchEvaluator matchEvaluator = null;
if (!(substitute is string) && LanguagePrimitives.TryConvertTo(substitute, out matchEvaluator))
switch (substitute)
{
return regex.Replace(input, matchEvaluator);
}
case ScriptBlock sb:
MatchEvaluator me = match => {
var result = sb.DoInvokeReturnAsIs(
useLocalScope: false, /* Use current scope to be consistent with 'ForEach/Where-Object {}' and 'collection.ForEach{}/Where{}' */
errorHandlingBehavior: ScriptBlock.ErrorHandlingBehavior.WriteToCurrentErrorPipe,
dollarUnder: match,
input: AutomationNull.Value,
scriptThis: AutomationNull.Value,
args: Utils.EmptyArray<object>());
string replacement = PSObject.ToStringParser(context, substitute);
return regex.Replace(input, replacement);
return PSObject.ToStringParser(context, result);;
};
return regex.Replace(input, me);
case object val when LanguagePrimitives.TryConvertTo(val, out MatchEvaluator matchEvaluator):
return regex.Replace(input, matchEvaluator);
default:
string replacement = PSObject.ToStringParser(context, substitute);
return regex.Replace(input, replacement);
}
}
/// <summary>

5
test/powershell/Language/Operators/ReplaceOperator.Tests.ps1
View File

@ -1,3 +1,6 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.
Describe "Replace Operator" -Tags CI {
Context "Replace operator" {
It "Replace operator can replace string values using regular expressions" {
@ -40,7 +43,7 @@ Describe "Replace Operator" -Tags CI {
}
It "Replace operator can take a ScriptBlock in place of a substitution string" {
$res = "ID ABC123" -replace "\b[A-C]+", {return "X" * $args[0].Value.Length}
$res = "ID ABC123" -replace "\b[A-C]+", {return "X" * $_[0].Value.Length}
$res | Should BeExactly "ID XXX123"
}