Skip to content

Fix for #6976 -replace operator slowed down after adding scriptblock support #7135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daxian-dbw merged 1 commit into from
Jun 26, 2018
Merged

Fix for #6976 -replace operator slowed down after adding scriptblock support #7135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/System.Management.Automation/engine/lang/parserutils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,7 @@ internal static object ReplaceOperator(ExecutionContext context, IScriptExtent e
pattern = rList[0];
if (rList.Count > 1)
{
substitute = rList[1];
substitute = PSObject.Base(rList[1]);
Copy link
Collaborator

@iSazonov iSazonov Jun 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please add a comment why it is needed? what we break without this?

Copy link
Collaborator Author

@BrucePay BrucePay Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, This is actually a pretty fundamental operation in PowerShell. Anywhere you receive something of type object, you have to deal with the case where it might be wrapped in a PSObject. So before you can use it as string or ScriptBlock, you have to get the base object. The PSObject.Base() method encapsulates this operation. If it's passed a PSObject, it returns the core object otherwise it just returns the object.

}
}
}
Expand Down Expand Up @@ -972,6 +972,9 @@ private static object ReplaceOperatorImpl(ExecutionContext context, string input
{
switch (substitute)
{
case string replacementString:
return regex.Replace(input, replacementString);

case ScriptBlock sb:
MatchEvaluator me = match => {
var result = sb.DoInvokeReturnAsIs(
Expand Down