Skip to content

WIP: Correct completions for quoting and escaping #10226

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

Closed
msftrncs wants to merge 19 commits into from
Closed

WIP: Correct completions for quoting and escaping #10226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f90dd1d
Create method QuoteMemberName
msftrncs Jul 25, 2019
feb11ae
Utilize QuoteMemberName codegenerator
msftrncs Jul 25, 2019
ae99f9b
improve variable name competion results
msftrncs Jul 25, 2019
edbd003
allow completion starting with `$:`
msftrncs Jul 25, 2019
d3366fe
remove orphaned s_charactersRequiringQuotes
msftrncs Jul 25, 2019
9f93023
Add argument processing methods
msftrncs Jul 25, 2019
cd71de2
Enhance all argument completers
msftrncs Jul 25, 2019
775de3d
Remove CompletionRequiresQuotes Method
msftrncs Jul 25, 2019
c5f2dc7
style, fix comments, minor code suggestions
msftrncs Jul 27, 2019
29fc897
move variable prefix concat into GenerateVariableCompletionText
msftrncs Jul 27, 2019
54b9874
Correct WildCard Escape Escape Char
msftrncs Jul 28, 2019
0cf65e2
Include quoting arg starting with dashes
msftrncs Jul 28, 2019
3876d5e
use enumerator directly in QuoteMemberName
msftrncs Jul 28, 2019
dde72f3
correct and optimize GenerateVariableCompletionText
msftrncs Jul 28, 2019
d7102b4
use string for QuoteToUse
msftrncs Jul 28, 2019
99ce10c
Optimize HandleDoubleAndSingleQuote
msftrncs Jul 28, 2019
7c206c8
correct short-circuit logic with parenthesis
msftrncs Jul 28, 2019
ccbc5d2
change of foreach loops to for / index loops
msftrncs Oct 24, 2019
f80e711
Implement new xRequiresQuote in CodeGen
msftrncs Dec 2, 2019
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
32 changes: 23 additions & 9 deletions src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2091,6 +2091,8 @@ private List<CompletionResult> GetResultForAttributeArgument(CompletionContext c
private static List<CompletionResult> CompleteFileNameAsCommand(CompletionContext completionContext)
{
var addAmpersandIfNecessary = CompletionCompleters.IsAmpersandNeeded(completionContext, true);
var wordToComplete = completionContext.WordToComplete;
var quote = CompletionCompleters.HandleDoubleAndSingleQuote(ref wordToComplete);
var result = new List<CompletionResult>();
var clearLiteralPathsKey = false;

Expand All @@ -2107,21 +2109,33 @@ private static List<CompletionResult> CompleteFileNameAsCommand(CompletionContex

try
{
var fileNameResult = CompletionCompleters.CompleteFilename(completionContext);
var fileNameResult = CompletionCompleters.CompleteFilename(completionContext, asCommand: true);
foreach (var entry in fileNameResult)
{
// Add '&' to file names that are quoted
var completionText = entry.CompletionText;
var len = completionText.Length;
if (addAmpersandIfNecessary && len > 2 && completionText[0].IsSingleQuote() && completionText[len - 1].IsSingleQuote())
{
completionText = "& " + completionText;
result.Add(new CompletionResult(completionText, entry.ListItemText, entry.ResultType, entry.ToolTip));
// Must determine if each file name needs quoting specifically when used as a command.
// If addAmpersandIfNecessary indicates we need to check for non-expandable syntax, and command isn't quoted,
// we'll need an ampersand if command requires quotes for non-expandable syntax.
bool needAmpersand = addAmpersandIfNecessary && string.IsNullOrEmpty(quote) &&
CodeGeneration.CmdRequiresQuote(completionText);

// Prepare the quote character to use (or null if not needing quoting), if not previously quoted, if either needing
// an ampersand or adding an ampersand is not permitted, and the command requires quotes for expandable syntax application,
// use a single quote, else keep it bareword, else use the previously supplied quote.
char quoteToUse = string.IsNullOrEmpty(quote)
? ((needAmpersand || !addAmpersandIfNecessary) && CodeGeneration.CmdRequiresQuote(completionText, true) ? '\'' : (char)0)
: quote[0];

if (quoteToUse != (char)0){
completionText = quoteToUse + (quoteToUse.IsDoubleQuote() ? CodeGeneration.EscapeDoubleQuotedStringContent(completionText) :
CodeGeneration.EscapeSingleQuotedStringContent(completionText)) + quoteToUse;
}
else

if (needAmpersand)
{
result.Add(entry);
completionText = "& " + completionText;
}
result.Add(new CompletionResult(completionText, entry.ListItemText, entry.ResultType, entry.ToolTip));
}
}
finally
Expand Down
Loading