Skip to content
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

Fix find references for indexer properties #1399

Merged
merged 3 commits into from
Mar 19, 2019
Merged

Fix find references for indexer properties #1399

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
1c707f5
find references fix
Feb 9, 2019
d2b7e63
always skip get/set from the list of definitions
Feb 11, 2019
8b2c359
Merge branch 'master' into FixIndexerPropertyReferences
filipw Mar 19, 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
63 changes: 26 additions & 37 deletions src/OmniSharp.Roslyn.CSharp/Services/Navigation/FindUsagesService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,49 +28,38 @@ public async Task<QuickFixResponse> Handle(FindUsagesRequest request)
{
// To produce complete list of usages for symbols in the document wait until all projects are loaded.
var document = await _workspace.GetDocumentFromFullProjectModelAsync(request.FileName);
var response = new QuickFixResponse();
if (document != null)
if (document == null)
{
var locations = new List<Location>();
var semanticModel = await document.GetSemanticModelAsync();
var sourceText = await document.GetTextAsync();
var position = sourceText.Lines.GetPosition(new LinePosition(request.Line, request.Column));
var symbol = await SymbolFinder.FindSymbolAtPositionAsync(semanticModel, position, _workspace);
var definition = await SymbolFinder.FindSourceDefinitionAsync(symbol, _workspace.CurrentSolution);
var usages = request.OnlyThisFile
? await SymbolFinder.FindReferencesAsync(definition ?? symbol, _workspace.CurrentSolution, ImmutableHashSet.Create(document))
: await SymbolFinder.FindReferencesAsync(definition ?? symbol, _workspace.CurrentSolution);
var dontRequireReferenceByName = symbol is IMethodSymbol method &&
(method.MethodKind == MethodKind.Constructor || method.MethodKind == MethodKind.UserDefinedOperator);

foreach (var usage in usages.Where(u => u.Definition.CanBeReferencedByName || dontRequireReferenceByName))
{
foreach (var location in usage.Locations)
{
locations.Add(location.Location);
}

if (!request.ExcludeDefinition)
{
var definitionLocations = usage.Definition.Locations
.Where(loc => loc.IsInSource && (!request.OnlyThisFile || loc.SourceTree.FilePath == request.FileName));
return new QuickFixResponse();
}

foreach (var location in definitionLocations)
{
locations.Add(location);
}
}
}
var semanticModel = await document.GetSemanticModelAsync();
var sourceText = await document.GetTextAsync();
var position = sourceText.Lines.GetPosition(new LinePosition(request.Line, request.Column));
var symbol = await SymbolFinder.FindSymbolAtPositionAsync(semanticModel, position, _workspace);
var definition = await SymbolFinder.FindSourceDefinitionAsync(symbol, _workspace.CurrentSolution);
var usages = request.OnlyThisFile
? await SymbolFinder.FindReferencesAsync(definition ?? symbol, _workspace.CurrentSolution, ImmutableHashSet.Create(document))
: await SymbolFinder.FindReferencesAsync(definition ?? symbol, _workspace.CurrentSolution);
var locations = usages.SelectMany(u => u.Locations).Select(l => l.Location).ToList();

var quickFixes = locations.Distinct().Select(l => l.GetQuickFix(_workspace));
if (!request.ExcludeDefinition)
{
// always skip get/set methods of properties from the list of definition locations.
var definitionLocations = usages.Select(u => u.Definition)
.Where(def => !(def is IMethodSymbol method && method.AssociatedSymbol is IPropertySymbol))
.SelectMany(def => def.Locations)
.Where(loc => loc.IsInSource && (!request.OnlyThisFile || loc.SourceTree.FilePath == request.FileName));

response = new QuickFixResponse(quickFixes.Distinct()
.OrderBy(q => q.FileName)
.ThenBy(q => q.Line)
.ThenBy(q => q.Column));
locations.AddRange(definitionLocations);
}

return response;
var quickFixes = locations.Distinct().Select(l => l.GetQuickFix(_workspace));

return new QuickFixResponse(quickFixes.Distinct()
.OrderBy(q => q.FileName)
.ThenBy(q => q.Line)
.ThenBy(q => q.Column));
}
}
}
29 changes: 29 additions & 0 deletions tests/OmniSharp.Roslyn.CSharp.Tests/FindReferencesFacts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,35 @@ public FooConsumer()
Assert.Equal(2, usages.QuickFixes.Count());
}

[Fact]
public async Task CanFindReferencesOfPublicIndexerProperty()
{
const string code = @"
public class Foo
{
int prop;

public int th$$is[int index]
{
get { return prop; }
set { prop = value; }
}
}

public class FooConsumer
{
public FooConsumer()
{
var foo = new Foo();
var prop = foo[0];
foo[0] = prop;
}
}";

var usages = await FindUsagesAsync(code);
Assert.Equal(3, usages.QuickFixes.Count());
}

[Fact]
public async Task CanFindReferencesOfClass()
{
Expand Down