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

Include source generators in TryGetMethodDescriptorAsync #51686

Merged
merged 3 commits into from
Mar 5, 2021
Merged

Include source generators in TryGetMethodDescriptorAsync #51686

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6543940
Include source generators in TryGetMethodDescriptorAsync
Youssef1313 Mar 5, 2021
dd7db76
Add CodeLens test for source generated document
Youssef1313 Mar 5, 2021
dcec616
Update CodeLensReferencesService.cs
Youssef1313 Mar 5, 2021
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
31 changes: 31 additions & 0 deletions src/EditorFeatures/CSharpTest/CodeLens/CSharpCodeLensTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,5 +350,36 @@ private void Test()
</Workspace>";
await RunReferenceTest(input);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeLens)]
[WorkItem(51633, "https://github.com/dotnet/roslyn/issues/51633")]
public async Task TestMethodRefSourceGeneratedDocument()
{
const string input = @"<Workspace>
<Project Language=""C#"" CommonReferences=""true"" AssemblyName=""Proj1"">
<Document FilePath=""Program.cs""><![CDATA[
namespace ConsoleSample
{
class Program
{
{|1:public Program()
{
}|}
}
}]]>
</Document>
<DocumentFromSourceGenerator><![CDATA[
namespace ConsoleSample
{
internal partial class Program
{
public static CreateProgram() => new Program();
}
}]]>
</DocumentFromSourceGenerator>
</Project>
</Workspace>";
await RunMethodReferenceTest(input);
}
}
}
2 changes: 1 addition & 1 deletion src/Features/Core/Portable/CodeLens/CodeLensReferencesService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ private static async Task<ReferenceMethodDescriptor> TryGetMethodDescriptorAsync
return null;
}

var document = solution.GetDocument(doc.Id);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am terrified to wonder how this code ever happened in the first place.

var document = await solution.GetDocumentAsync(doc.Id, includeSourceGenerated: true, cancellationToken).ConfigureAwait(false);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i honestly don't understand the point of the before/after line in teh first place. Right above this, we already found teh 'doc', so why not just use that?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@CyrusNajmabadi Honestly, me too. Let me delete it and see if there are any failures that explains this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm guessing this got refactored over the years and ended up in this form without anybody realizing it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This goes back to b83e577

var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
var fullName = GetEnclosingMethod(semanticModel, commonLocation, cancellationToken)?.ToDisplayString(MethodDisplayFormat);

Expand Down