Skip to content

Fix document highlight column #1279

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
merged 6 commits into from
May 1, 2020
Merged

Fix document highlight column #1279

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6c8a902
Fix document highlight column
TylerLeonhardt Apr 30, 2020
9438862
make method static
TylerLeonhardt Apr 30, 2020
73616c6
handle newlines and add test
TylerLeonhardt May 1, 2020
4752ab4
codacy and skip a bad test
TylerLeonhardt May 1, 2020
ff81058
tired of this test failing
TylerLeonhardt May 1, 2020
671cae6
Windows is slow so give an extra second
TylerLeonhardt May 1, 2020
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
36 changes: 31 additions & 5 deletions src/PowerShellEditorServices/Services/Symbols/Vistors/FindReferencesVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,7 @@ public override AstVisitAction VisitCommand(CommandAst commandAst)
/// <returns>A visit action that continues the search for references</returns>
public override AstVisitAction VisitFunctionDefinition(FunctionDefinitionAst functionDefinitionAst)
{
// Get the start column number of the function name,
// instead of the the start column of 'function' and create new extent for the functionName
int startColumnNumber =
functionDefinitionAst.Extent.Text.IndexOf(
functionDefinitionAst.Name) + 1;
int startColumnNumber = GetStartColumnNumberFromAst(functionDefinitionAst);

IScriptExtent nameExtent = new ScriptExtent()
{
Expand Down Expand Up @@ -185,5 +181,35 @@ public override AstVisitAction VisitVariableExpression(VariableExpressionAst var
}
return AstVisitAction.Continue;
}

// Computes where the start of the actual function name is.
private static int GetStartColumnNumberFromAst(FunctionDefinitionAst ast)
{
int astOffset = 0;

if (ast.IsFilter)
{
astOffset = "filter".Length;
}
else if (ast.IsWorkflow)
{
astOffset = "workflow".Length;
}
else
{
astOffset = "function".Length;
}

string astText = ast.Extent.Text;
for (; astOffset < astText.Length; astOffset++)
{
if (!char.IsWhiteSpace(astText[astOffset]))
{
break;
}
}

return ast.Extent.StartColumnNumber + astOffset;
}
}
}