Skip to content

Commit e407453

Browse files
committed
Fix display string for function definitions
Space between name and subsequent parenthesis.
1 parent e990670 commit e407453

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

src/PowerShellEditorServices/Utility/VisitorUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ internal static string GetFunctionDisplayName(FunctionDefinitionAst functionDefi
251251
{
252252
sb.Append("function");
253253
}
254-
sb.Append(' ').Append(functionDefinitionAst.Name).Append('(');
254+
sb.Append(' ').Append(functionDefinitionAst.Name).Append(" (");
255255
// Add parameters
256256
// TODO: Fix the parameters, this doesn't work for those specified in the body.
257257
if (functionDefinitionAst.Parameters?.Count > 0)

test/PowerShellEditorServices.Test/Language/SymbolsServiceTests.cs

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public async Task FindsFunctionDefinition()
165165
{
166166
SymbolReference symbol = await GetDefinition(FindsFunctionDefinitionData.SourceDetails).ConfigureAwait(true);
167167
Assert.Equal("My-Function", symbol.SymbolName);
168-
Assert.Equal("function My-Function($myInput)", symbol.DisplayString);
168+
Assert.Equal("function My-Function ($myInput)", symbol.DisplayString);
169169
Assert.Equal(SymbolType.Function, symbol.SymbolType);
170170
AssertIsRegion(symbol.NameRegion, 1, 10, 1, 21);
171171
AssertIsRegion(symbol.ScriptRegion, 1, 1, 4, 2);
@@ -182,7 +182,7 @@ await psesHost.ExecutePSCommandAsync(
182182
CancellationToken.None).ConfigureAwait(true);
183183

184184
SymbolReference symbol = await GetDefinition(FindsFunctionDefinitionOfAliasData.SourceDetails).ConfigureAwait(true);
185-
Assert.Equal("function My-Function($myInput)", symbol.DisplayString);
185+
Assert.Equal("function My-Function ($myInput)", symbol.DisplayString);
186186
Assert.Equal(SymbolType.Function, symbol.SymbolType);
187187
AssertIsRegion(symbol.NameRegion, 1, 10, 1, 21);
188188
AssertIsRegion(symbol.ScriptRegion, 1, 1, 4, 2);
@@ -193,10 +193,17 @@ await psesHost.ExecutePSCommandAsync(
193193
public async Task FindsReferencesOnFunction()
194194
{
195195
IEnumerable<SymbolReference> symbols = await GetReferences(FindsReferencesOnFunctionData.SourceDetails).ConfigureAwait(true);
196-
Assert.Collection(symbols,
197-
(i) => AssertIsRegion(i.NameRegion, 1, 10, 1, 21),
198-
(i) => AssertIsRegion(i.NameRegion, 3, 5, 3, 16),
199-
(i) => AssertIsRegion(i.NameRegion, 10, 1, 10, 12));
196+
Assert.Equal(8, symbols.Count());
197+
Assert.All(symbols, (i) =>
198+
{
199+
Assert.Equal("My-Function", i.SymbolName);
200+
Assert.Equal(SymbolType.Function, i.SymbolType);
201+
if (i.IsDeclaration)
202+
{
203+
Assert.Equal("function My-Function ($myInput)", i.DisplayString);
204+
}
205+
});
206+
Assert.Distinct(symbols);
200207
}
201208

202209
[Fact]

0 commit comments

Comments
 (0)