Skip to content

Fix handling of partial definition deletes #77735

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

Merged
tmat merged 2 commits into from
Mar 24, 2025
Merged

Fix handling of partial definition deletes #77735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb4c748
Fix handling of partial definition deletes
tmat Mar 21, 2025
917338c
Fix test
tmat Mar 24, 2025
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
27 changes: 14 additions & 13 deletions src/Features/CSharpTest/EditAndContinue/TopLevelEditingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10257,6 +10257,17 @@ public void Method_Partial_DeleteImplementation()
]);
}

[Fact]
public void Method_Partial_DeleteDefinition()
{
var src1 = "partial class C { partial void F(); }";
var src2 = "partial class C { }";

var edits = GetTopEdits(src1, src2);

edits.VerifySemantics();
}

[Fact]
public void Method_Partial_DeleteBoth()
{
Expand All @@ -10269,8 +10280,7 @@ public void Method_Partial_DeleteBoth()
EditAndContinueValidation.VerifySemantics(
[GetTopEdits(srcA1, srcA2), GetTopEdits(srcB1, srcB2)],
[
DocumentResults(
semanticEdits: [SemanticEdit(SemanticEditKind.Delete, c => c.GetMember<IMethodSymbol>("C.F").PartialImplementationPart, deletedSymbolContainerProvider: c => c.GetMember("C"), partialType: "C")]),
DocumentResults(),
DocumentResults(
semanticEdits: [SemanticEdit(SemanticEditKind.Delete, c => c.GetMember<IMethodSymbol>("C.F").PartialImplementationPart, deletedSymbolContainerProvider: c => c.GetMember("C"), partialType: "C")]),
]);
Expand Down Expand Up @@ -11830,11 +11840,7 @@ public void Constructor_Parameter_Insert_Primary_Record_WithCustomDeconstructor_
SemanticEdit(SemanticEditKind.Delete, c => c.GetPrimaryConstructor("C"), deletedSymbolContainerProvider: c => c.GetMember("C")),
SemanticEdit(SemanticEditKind.Insert, c => c.GetPrimaryConstructor("C")),
]),
DocumentResults(
semanticEdits:
[
SemanticEdit(SemanticEditKind.Delete, c => c.GetPrimaryDeconstructor("C").PartialImplementationPart, deletedSymbolContainerProvider: c => c.GetMember("C"), partialType: "C"),
]),
DocumentResults(),
],
capabilities: EditAndContinueCapabilities.AddMethodToExistingType | EditAndContinueCapabilities.AddInstanceFieldToExistingType);
}
Expand Down Expand Up @@ -19301,12 +19307,7 @@ public void Property_Partial_DeleteBoth()
EditAndContinueValidation.VerifySemantics(
[GetTopEdits(srcA1, srcA2), GetTopEdits(srcB1, srcB2)],
[
DocumentResults(
semanticEdits:
[
SemanticEdit(SemanticEditKind.Delete, c => c.GetMember<IPropertySymbol>("C.P").PartialImplementationPart, deletedSymbolContainerProvider: c => c.GetMember("C"), partialType: "C"),
SemanticEdit(SemanticEditKind.Delete, c => c.GetMember<IMethodSymbol>("C.get_P").PartialImplementationPart, deletedSymbolContainerProvider: c => c.GetMember("C"), partialType: "C")
]),
DocumentResults(),
DocumentResults(
semanticEdits:
[
Expand Down
4 changes: 2 additions & 2 deletions src/Features/Core/Portable/EditAndContinue/AbstractEditAndContinueAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2721,8 +2721,8 @@ newSymbol is IPropertySymbol newProperty &&
}

// If a partial method/property/indexer definition is deleted (and not moved to another partial type declaration, which is handled above)
// so must be the implementation. An edit will be issued for the implementation change.
if (newSymbol?.IsPartialDefinition() == true)
// so must be the implementation (if it exists). An edit will be issued for the implementation change.
if (oldSymbol.IsPartialDefinition())
{
continue;
}
Expand Down
6 changes: 1 addition & 5 deletions src/Features/VisualBasicTest/EditAndContinue/TopLevelEditingTests.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6029,11 +6029,7 @@ End Interface
EditAndContinueValidation.VerifySemantics(
{GetTopEdits(srcA1, srcA2), GetTopEdits(srcB1, srcB2)},
{
DocumentResults(
semanticEdits:=
{
SemanticEdit(SemanticEditKind.Delete, Function(c) c.GetMember(Of MethodSymbol)("C.F").PartialImplementationPart, deletedSymbolContainerProvider:=Function(c) c.GetMember("C"), partialType:="C")
}),
DocumentResults(),
DocumentResults(
semanticEdits:=
{
Expand Down
Loading