Skip to content

Prioritize highlight of command names, prevent bleed from aligned nested tokens #989

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 3 commits into from
Sep 6, 2019
Merged

Prioritize highlight of command names, prevent bleed from aligned nested tokens #989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f42dfe
prioritize highlight of command names
msftrncs Aug 3, 2019
b4fcbd7
catch when nested tokens end together
msftrncs Aug 3, 2019
2062ead
Add Render Tests
msftrncs Sep 6, 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
12 changes: 6 additions & 6 deletions PSReadLine/Render.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ void MaybeEmphasize(int i, string currColor)
// use the tokens color otherwise use the initial color.
var state = tokenStack.Peek();
var token = state.Tokens[state.Index];
if (i == token.Extent.EndOffset)
while (i == token.Extent.EndOffset)
{
if (token == state.Tokens[state.Tokens.Length - 1])
{
Expand Down Expand Up @@ -630,6 +630,11 @@ private static int LengthInBufferCells(char c)

private string GetTokenColor(Token token)
{
if ((token.TokenFlags & TokenFlags.CommandName) != 0)
{
return _options._commandColor;
}

switch (token.Kind)
{
case TokenKind.Comment:
Expand All @@ -653,11 +658,6 @@ private string GetTokenColor(Token token)
return _options._numberColor;
}

if ((token.TokenFlags & TokenFlags.CommandName) != 0)
{
return _options._commandColor;
}

if ((token.TokenFlags & TokenFlags.Keyword) != 0)
{
return _options._keywordColor;
Expand Down
33 changes: 33 additions & 0 deletions test/RenderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,39 @@ public void Render()
InputAcceptedNow
));

// This tests for priority to highlight a command regardless of token kind and nested tokens potential to bleed the parent token color to the next token
Test("", Keys(
". -abc def;. abc$name -def",
_.Home,
CheckThat(() =>
AssertScreenIs(1,
TokenClassification.None, ". ",
TokenClassification.Command, "-abc",
TokenClassification.None, " def;. ",
TokenClassification.Command, "abc",
TokenClassification.Variable, "$name",
TokenClassification.None, " ",
TokenClassification.Parameter, "-def")),
_.Ctrl_c,
InputAcceptedNow
));

// Additional test for priority to highlight a command regardless of token kind and nested tokens potential to bleed the parent token color to the next token
Test("", Keys(
". ++ abc$name -def",
_.Home,
CheckThat(() =>
AssertScreenIs(1,
TokenClassification.None, ". ",
TokenClassification.Command, "++",
TokenClassification.None, " abc",
TokenClassification.Variable, "$name",
TokenClassification.None, " ",
TokenClassification.Parameter, "-def")),
_.Ctrl_c,
InputAcceptedNow
));

Test("", Keys(
"\"$([int];\"_$(1+2)\")\"",
CheckThat(() =>
Expand Down