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

Jump to bottom

Support abstract methods and records in complete statement command #48128

Merged
merged 12 commits into from
Apr 8, 2021
Merged

Support abstract methods and records in complete statement command #48128

merged 12 commits into from
Apr 8, 2021

Conversation

Youssef1313
Copy link
Member

No description provided.

@Youssef1313 Youssef1313 requested a review from a team as a code owner September 28, 2020 22:10
@Youssef1313 Youssef1313 marked this pull request as draft September 28, 2020 22:26
@jinujoseph jinujoseph added Area-IDE Community The pull request was submitted by a contributor who is not a Microsoft employee. labels Sep 29, 2020
@Youssef1313 Youssef1313 marked this pull request as ready for review October 1, 2020 13:21
@Youssef1313 Youssef1313 changed the title Add tests for simple positional record in complete statement command Support abstract methods and records in complete statement command Oct 2, 2020
@runfoapp runfoapp bot mentioned this pull request Oct 5, 2020
Closed
CyrusNajmabadi
CyrusNajmabadi reviewed Nov 9, 2020
View reviewed changes
src/EditorFeatures/CSharpTest/CompleteStatement/CSharpCompleteStatementCommandHandlerTests.cs
@@ -47,6 +47,9 @@ internal static int MethodM(int a, int b)
[InlineData("abstract void M(object o = default(object$$))", "abstract void M(object o = default(object))")]
[InlineData("abstract void M(object o = default($$object))", "abstract void M(object o = default(object))")]
[InlineData("abstract void M(object o = $$default(object))", "abstract void M(object o = default(object))")]
[InlineData("public record C(int X, $$int Y)", "public record C(int X, int Y)")]
[InlineData("public record C(int X, int$$ Y)", "public record C(int X, int Y)")]
[InlineData("public record C(int X, int Y$$)", "public record C(int X, int Y)")]
Copy link
Member

Choose a reason for hiding this comment

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

i see tests added for records, but nothing new for the 'abstract method' code you added. do we need tests for 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 Abstract methods already have tests. But the test was disabled. I added record tests (in addition to the existing for abstract methods), and enabled the test.

Copy link
Member

Choose a reason for hiding this comment

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

ok!

@CyrusNajmabadi CyrusNajmabadi marked this pull request as draft November 9, 2020 19:14
@Youssef1313
Copy link
Member Author

@CyrusNajmabadi I'm going to re-mark this as ready for review as the tests are already there.

@Youssef1313 Youssef1313 marked this pull request as ready for review November 9, 2020 21:25
@Youssef1313
Copy link
Member Author

@CyrusNajmabadi Is this ready for merge?

@Youssef1313
Copy link
Member Author

@CyrusNajmabadi Is this ready if CI passes?

@Youssef1313 Youssef1313 mentioned this pull request Feb 18, 2021
Closed
92 tasks
CyrusNajmabadi
CyrusNajmabadi reviewed Feb 22, 2021
View reviewed changes
src/EditorFeatures/CSharp/CompleteStatement/CompleteStatementCommandHandler.cs Outdated

if (currentNode is MethodDeclarationSyntax method &&
(method.Modifiers.Any(SyntaxKind.AbstractKeyword) || method.Modifiers.Any(SyntaxKind.ExternKeyword) ||
method.IsParentKind(SyntaxKind.InterfaceDeclaration)))
Copy link
Member

Choose a reason for hiding this comment

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

this statements is too complex to me.

CyrusNajmabadi
CyrusNajmabadi requested changes Feb 22, 2021
View reviewed changes
Copy link
Member

@CyrusNajmabadi CyrusNajmabadi left a comment

Choose a reason for hiding this comment

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

can you simplify this a bit. mixing &&'s and ||s is too confusing to me.

Base automatically changed from master to main March 3, 2021 23:52
@Youssef1313
Copy link
Member Author

@CyrusNajmabadi Anything left?

sharwell
sharwell reviewed Mar 31, 2021
View reviewed changes
src/EditorFeatures/CSharp/CompleteStatement/CompleteStatementCommandHandler.cs
Comment on lines +220 to +221
if (method.Modifiers.Any(SyntaxKind.AbstractKeyword) || method.Modifiers.Any(SyntaxKind.ExternKeyword) ||
method.IsParentKind(SyntaxKind.InterfaceDeclaration))
Copy link
Member

Choose a reason for hiding this comment

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

❔ Is there any harm in making this unconditional?

Copy link
Member

Choose a reason for hiding this comment

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

📝 Note that partial methods also can be declared without a body.

Copy link
Member Author

Choose a reason for hiding this comment

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

@sharwell I think it will unnecessarily move the caret to the end for typos, which can be annoying.

Copy link
Member Author

Choose a reason for hiding this comment

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

📝 Note that partial methods also can be declared without a body.

That's a good case. Going to fix it and add a test.

sharwell
sharwell approved these changes Mar 31, 2021
View reviewed changes
Copy link
Member

@sharwell sharwell left a comment

Choose a reason for hiding this comment

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

No objection to the current expansion, but I think we should make the behavior unconditional for methods.

@Youssef1313
Copy link
Member Author

@sharwell It this ready to merge?

@sharwell sharwell enabled auto-merge April 8, 2021 01:22
CyrusNajmabadi
CyrusNajmabadi approved these changes Apr 8, 2021
View reviewed changes
Copy link
Member

@CyrusNajmabadi CyrusNajmabadi left a comment

Choose a reason for hiding this comment

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

thanks!

@sharwell sharwell merged commit 9853099 into dotnet:main Apr 8, 2021
@ghost ghost added this to the Next milestone Apr 8, 2021
@Youssef1313 Youssef1313 deleted the patch-17 branch April 8, 2021 02:55
@dibarbet dibarbet modified the milestones: Next, 16.10.P3 Apr 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sharwell sharwell sharwell approved these changes

@CyrusNajmabadi CyrusNajmabadi CyrusNajmabadi approved these changes

Assignees

@CyrusNajmabadi CyrusNajmabadi

Labels
Area-IDE Community The pull request was submitted by a contributor who is not a Microsoft employee.
Projects
None yet
Milestone
16.10.P3
Development

Successfully merging this pull request may close these issues.
5 participants
@Youssef1313 @sharwell @CyrusNajmabadi @dibarbet @jinujoseph