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.

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

Speculative changes to PrimaryConstructorBaseTypeSyntax #75546

Merged
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 @@ -2251,6 +2251,34 @@ class C<T>
""");
}

[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/75026")]
public async Task SimplifyUnmentionableTypeParameter3()
{
await TestMissingInRegularAndScriptAsync(
"""
public class C<T>;

public class D : C<[|D.E|]>
{
public class E;
}
""");
}

[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/75026")]
public async Task SimplifyUnmentionableTypeParameter3_PrimaryCtor()
{
await TestMissingInRegularAndScriptAsync(
"""
public class C<T>;

public class D() : C<[|D.E|]>()
{
public class E;
}
""");
}

[Fact]
public async Task TestGlobalAlias()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,22 @@ protected override SyntaxNode GetSemanticRootForSpeculation(ExpressionSyntax exp
{
Debug.Assert(expression != null);

var parentNodeToSpeculate = expression
.AncestorsAndSelf(ascendOutOfTrivia: false)
.Where(CanSpeculateOnNode)
.LastOrDefault();
SyntaxNode previousNode = null;
SyntaxNode parentNodeToSpeculate = null;
foreach (var node in expression.AncestorsAndSelf(ascendOutOfTrivia: false))
{
if (CanSpeculateOnNode(node))
{
// Only speculate on PrimaryConstructorBaseTypeSyntax if we are inside the argument list
if (node.Kind() is not SyntaxKind.PrimaryConstructorBaseType ||
previousNode.Kind() is SyntaxKind.ArgumentList)
{
parentNodeToSpeculate = node;
}
}

previousNode = node;
}

return parentNodeToSpeculate ?? expression;
}
Expand Down
Loading