Apply quoting for globbing * and ~ in splatting.#26232
Open
kzrnm wants to merge 6 commits into
Open
Apply quoting for globbing * and ~ in splatting.#26232kzrnm wants to merge 6 commits into
* and ~ in splatting.#26232kzrnm wants to merge 6 commits into
Conversation
Collaborator
|
@kzrnm Could you look at the test failures? I tried to resolve a conflict but could have botched it. |
Author
|
@jshigetomi I’ve managed to find some time, so I’ll start looking into this now. |
Contributor
There was a problem hiding this comment.
Pull request overview
Note
Copilot was unable to run its full agentic suite in this review.
This PR enhances native argument handling by preserving string quoting metadata through compilation/runtime so native features (tilde expansion and UNIX globbing) behave correctly across direct invocation and splatting scenarios.
Changes:
- Expanded Pester test coverage for tilde expansion and UNIX globbing, including quoted and splatted inputs.
- Added runtime/compiler support to wrap string arguments with their
StringConstantTypeso quoting intent is preserved. - Updated native parameter binding to read the preserved
StringConstantTypefrom wrapped string arguments.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| test/powershell/Language/Scripting/NativeExecution/NativeWindowsTildeExpansion.Tests.ps1 | Reworks tilde-expansion tests into table-driven coverage for direct, quoted, and splatted cases. |
| test/powershell/Language/Scripting/NativeExecution/NativeUnixGlobbing.Tests.ps1 | Adds/reenables tests for quoted + splatted behavior and aligns expectations via testexe -echoargs. |
| src/System.Management.Automation/engine/runtime/ScriptBlockToPowerShell.cs | Wraps constant/expandable string arguments with StringConstantType metadata during AST->PowerShell conversion. |
| src/System.Management.Automation/engine/parser/Compiler.cs | Emits wrapped string constants and wraps expandable strings during compilation via cached reflection. |
| src/System.Management.Automation/engine/lang/parserutils.cs | Adds ParserOps.WrappedString helper to attach StringConstantType metadata to strings. |
| src/System.Management.Automation/engine/NativeCommandParameterBinder.cs | Consumes wrapped string metadata to determine usedQuotes, and unwraps to the base string for native binding. |
| internal static class ParserOps | ||
| { | ||
| internal const string MethodNotFoundErrorId = "MethodNotFound"; | ||
| internal const string StringConstantType = "StringConstantType"; |
Comment on lines
+294
to
+299
| internal static PSObject WrappedString(string text, StringConstantType stringConstantType) | ||
| { | ||
| var wrapped = new PSObject(text); | ||
| wrapped.Properties.Add(new PSNoteProperty(StringConstantType, stringConstantType), true); | ||
| return wrapped; | ||
| } |
Comment on lines
+841
to
+845
| if (ast is ExpandableStringExpressionAst expandableStringExpressionAst) | ||
| { | ||
| Debug.Assert(argument is string); | ||
| argument = ParserOps.WrappedString(argument as string, expandableStringExpressionAst.StringConstantType); | ||
| } |
Comment on lines
+102
to
107
| bool usedQuotes; | ||
| if (argValue is PSObject { BaseObject: string baseString } psObject && psObject.Properties[ParserOps.StringConstantType]?.Value is StringConstantType stp) | ||
| { | ||
| case StringConstantExpressionAst sce: | ||
| usedQuotes = sce.StringConstantType != StringConstantType.BareWord; | ||
| break; | ||
| case ExpandableStringExpressionAst ese: | ||
| usedQuotes = ese.StringConstantType != StringConstantType.BareWord; | ||
| break; | ||
| case ArrayLiteralAst ala: | ||
| arrayLiteralAst = ala; | ||
| break; | ||
| usedQuotes = stp != StringConstantType.BareWord; | ||
| argValue = baseString; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR Summary
Fix #24178
According to the comment added in #5188:
https://github.com/kzrnm/PowerShell/blob/26bb188c8be0cda6cb548ce1a12840ebf67e1331/test/powershell/Language/Scripting/NativeExecution/NativeUnixGlobbing.Tests.ps1#L84-L88
However, I disagree with this comment. As noted in #24178, there are cases where one wants to use splatting without enabling globbing. Therefore, I believe implementing this via a
NotePropertywould be worth it.Additional considerations
When using an expression other than a string literal, such as
/bin/echo "a*a".Replace("a",""), globbing is performed. This behavior is unintuitive, so I think it’s worth considering a breaking change to make it not perform globbing along with the above modification.PR Context
PR Checklist
.h,.cpp,.cs,.ps1and.psm1files have the correct copyright header