Skip to content

Commit 7991b98

Browse files
committed
Fix typo
1 parent e8e74fa commit 7991b98

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

src/PowerShellEditorServices/Services/Symbols/SymbolReference.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public SymbolReference(
5151
SymbolName = symbolName;
5252
ScriptRegion = new(scriptExtent);
5353
NameRegion = ScriptRegion;
54-
FilePath = filePath;
54+
FilePath = string.IsNullOrEmpty(filePath) ? scriptExtent.File : filePath;
5555
SourceLine = sourceLine;
5656
IsDeclaration = isDeclaration;
5757
}

test/PowerShellEditorServices.Test/Language/SymbolsServiceTests.cs

+16-15
Original file line numberDiff line numberDiff line change
@@ -84,33 +84,34 @@ private Task<SymbolReference> GetDefinition(ScriptRegion scriptRegion)
8484
{
8585
ScriptFile scriptFile = GetScriptFile(scriptRegion);
8686

87-
SymbolReference symbolReference = SymbolsService.FindSymbolAtLocation(
87+
// TODO: We should just use the name to find it.
88+
SymbolReference symbol = SymbolsService.FindSymbolAtLocation(
8889
scriptFile,
8990
scriptRegion.StartLineNumber,
9091
scriptRegion.StartColumnNumber);
9192

92-
Assert.NotNull(symbolReference);
93+
Assert.NotNull(symbol);
9394

94-
return symbolsService.GetDefinitionOfSymbolAsync(scriptFile, symbolReference);
95+
return symbolsService.GetDefinitionOfSymbolAsync(scriptFile, symbol);
9596
}
9697

9798
private async Task<List<SymbolReference>> GetReferences(ScriptRegion scriptRegion)
9899
{
99100
ScriptFile scriptFile = GetScriptFile(scriptRegion);
100101

101-
SymbolReference symbolReference = SymbolsService.FindSymbolAtLocation(
102+
SymbolReference symbol = SymbolsService.FindSymbolAtLocation(
102103
scriptFile,
103104
scriptRegion.StartLineNumber,
104105
scriptRegion.StartColumnNumber);
105106

106-
Assert.NotNull(symbolReference);
107+
Assert.NotNull(symbol);
107108

108109
IEnumerable<SymbolReference> symbols =
109110
await symbolsService.ScanForReferencesOfSymbol(
110-
symbolReference,
111+
symbol,
111112
workspace.ExpandScriptReferences(scriptFile)).ConfigureAwait(true);
112113

113-
return symbols.OrderBy(symbol => symbol.ScriptRegion.ToRange().Start).ToList();
114+
return symbols.OrderBy(i => i.ScriptRegion.ToRange().Start).ToList();
114115
}
115116

116117
private IReadOnlyList<SymbolReference> GetOccurrences(ScriptRegion scriptRegion)
@@ -423,10 +424,10 @@ public async Task FindsConstructorDefinition()
423424
[Fact]
424425
public async Task FindsReferencesOnConstructor()
425426
{
426-
List<SymbolReference> referencesResult = await GetReferences(FindsReferencesOnTypeSymbolsData.ConstructorSourceDetails).ConfigureAwait(true);
427-
Assert.Single(referencesResult);
428-
Assert.Equal(9, referencesResult[0].ScriptRegion.StartLineNumber);
429-
Assert.Equal(5, referencesResult[0].ScriptRegion.StartColumnNumber);
427+
List<SymbolReference> symbols = await GetReferences(FindsReferencesOnTypeSymbolsData.ConstructorSourceDetails).ConfigureAwait(true);
428+
Assert.Single(symbols);
429+
Assert.Equal(9, symbols[0].ScriptRegion.StartLineNumber);
430+
Assert.Equal(5, symbols[0].ScriptRegion.StartColumnNumber);
430431
}
431432

432433
[Fact]
@@ -736,10 +737,10 @@ public void FindsSymbolsInPesterFile()
736737
Assert.Equal(9, lastItSymbol.ScriptRegion.StartColumnNumber);
737738

738739
Assert.Equal(1, symbolsResult.Count(r => r.Command == PesterCommandType.BeforeDiscovery));
739-
SymbolReference firstBeforeDisocverySymbol = symbolsResult.First(r => r.Command == PesterCommandType.BeforeDiscovery);
740-
Assert.Equal("BeforeDiscovery", firstBeforeDisocverySymbol.SymbolName);
741-
Assert.Equal(1, firstBeforeDisocverySymbol.ScriptRegion.StartLineNumber);
742-
Assert.Equal(1, firstBeforeDisocverySymbol.ScriptRegion.StartColumnNumber);
740+
SymbolReference firstBeforeDiscoverySymbol = symbolsResult.First(r => r.Command == PesterCommandType.BeforeDiscovery);
741+
Assert.Equal("BeforeDiscovery", firstBeforeDiscoverySymbol.SymbolName);
742+
Assert.Equal(1, firstBeforeDiscoverySymbol.ScriptRegion.StartLineNumber);
743+
Assert.Equal(1, firstBeforeDiscoverySymbol.ScriptRegion.StartColumnNumber);
743744

744745
Assert.Equal(2, symbolsResult.Count(r => r.Command == PesterCommandType.BeforeAll));
745746
SymbolReference lastBeforeAllSymbol = symbolsResult.Last(r => r.Command == PesterCommandType.BeforeAll);

0 commit comments

Comments
 (0)