Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,21 @@ public override AstVisitAction VisitVariableExpression(VariableExpressionAst var
return AstVisitAction.Continue;
}

// Count $Function:MyFunction as function references.
if (variableExpressionAst.VariablePath.IsDriveQualified
&& variableExpressionAst.VariablePath.DriveName.Equals("Function", StringComparison.OrdinalIgnoreCase))
{
return _action(new SymbolReference(
SymbolType.Function,
"fn " + VisitorUtils.GetUnqualifiedVariableName(variableExpressionAst.VariablePath),
"$" + variableExpressionAst.VariablePath.UserPath,
variableExpressionAst.Extent,
variableExpressionAst.Extent,
_file,
false
));
}

// TODO: Consider tracking unscoped variable references only when they're declared within
// the same function definition.
return _action(new SymbolReference(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ Write-Host
Get-ChildItem

My-Alias

Invoke-Command -ScriptBlock ${Function:My-Function}
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,13 @@ public async Task FindsReferencesOnFunction()
Assert.Equal("My-Function", i.Name);
Assert.Equal(SymbolType.Function, i.Type);
Assert.False(i.IsDeclaration);
},
(i) =>
{
Assert.Equal("fn My-Function", i.Id);
Assert.Equal("$Function:My-Function", i.Name);
Assert.Equal(SymbolType.Function, i.Type);
Assert.False(i.IsDeclaration);
});
}

Expand All @@ -246,7 +253,8 @@ await psesHost.ExecutePSCommandAsync(
{
AssertIsRegion(i.NameRegion, 20, 1, 20, 9);
Assert.Equal("fn My-Alias", i.Id);
});
},
(i) => AssertIsRegion(i.NameRegion, 22, 29, 22, 52));
}

[Fact]
Expand Down Expand Up @@ -324,6 +332,13 @@ public void FindsOccurrencesOnFunction()
Assert.Equal("fn My-Function", i.Id);
Assert.Equal(SymbolType.Function, i.Type);
Assert.False(i.IsDeclaration);
},
(i) =>
{
Assert.Equal("fn My-Function", i.Id);
Assert.Equal("$Function:My-Function", i.Name);
Assert.Equal(SymbolType.Function, i.Type);
Assert.False(i.IsDeclaration);
});
}

Expand Down