Skip to content
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

Jump to bottom

Add completion for keywords #21171

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
+845 −20
Open

Add completion for keywords #21171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
caa5434
Add keyword completions
MartinGC94 Feb 1, 2024
4c2eda9
Fix tests
MartinGC94 Feb 2, 2024
f9f8a2d
Refine some of the completions, add comments and add completion for t…
MartinGC94 Feb 2, 2024
f3f676d
Remove interfering file completion fallback.
MartinGC94 Feb 2, 2024
0ecf5c4
Fix missing tooltip for DynamicParam
MartinGC94 Feb 2, 2024
eac2a85
Update tooltips
MartinGC94 Feb 4, 2024
2b40636
Fix various scenarios where completion did not work as expected
MartinGC94 Feb 4, 2024
5a4f955
Add tests
MartinGC94 Feb 4, 2024
fe317ca
Fix usingstatement issue
MartinGC94 Feb 4, 2024
39d1205
Remove unused code
MartinGC94 Feb 6, 2024
7e60a33
Rework the Ast analysis to be more robust with and without partial input
MartinGC94 Feb 6, 2024
9ebc8f9
Merge branch 'PowerShell:master' into KeywordCompletions
MartinGC94 Feb 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/System.Management.Automation/engine/CommandCompletion/CommandCompletion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public CommandCompletion(Collection<CompletionResult> matches, int currentMatchI
/// <returns></returns>
public static CommandCompletion CompleteInput(string input, int cursorIndex, Hashtable options)
{
if (input == null || input.Length == 0)
if (input == null)
{
return s_emptyCommandCompletion;
}
Expand Down Expand Up @@ -143,7 +143,7 @@ public static CommandCompletion CompleteInput(Ast ast, Token[] tokens, IScriptPo
[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "powershell")]
public static CommandCompletion CompleteInput(string input, int cursorIndex, Hashtable options, PowerShell powershell)
{
if (input == null || input.Length == 0)
if (input == null)
{
return s_emptyCommandCompletion;
}
Expand Down
18 changes: 9 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 @@ -1143,19 +1143,19 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
}
}

if (result == null || result.Count == 0)
if (result is null || result.Count == 0)
{
// Handle special file completion scenarios: .\+file.txt -> +<tab>
string input = completionContext.RelatedAsts[0].Extent.Text;
if (Regex.IsMatch(input, @"^[\S]+$") && completionContext.RelatedAsts.Count > 0 && completionContext.RelatedAsts[0] is ScriptBlockAst)
result = CompletionCompleters.CompleteKeywords(completionContext, _tokens);
if (result.Count > 0 && (tokenAtCursor is null || (tokenAtCursor.Kind != TokenKind.Identifier && !tokenAtCursor.TokenFlags.HasFlag(TokenFlags.Keyword))))
{
replacementIndex = completionContext.RelatedAsts[0].Extent.StartScriptPosition.Offset;
replacementLength = completionContext.RelatedAsts[0].Extent.EndScriptPosition.Offset - replacementIndex;

completionContext.WordToComplete = input;
result = CompleteFileNameAsCommand(completionContext);
replacementIndex = completionContext.CursorPosition.Offset;
replacementLength = 0;
}
}
else
{
result.AddRange(CompletionCompleters.CompleteKeywords(completionContext, _tokens));
}

return result;
}
Expand Down