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

Disable extract class/interface to a new file when unsupported by the workspace. #76717

Merged
merged 4 commits into from
Jan 14, 2025
Merged

Disable extract class/interface to a new file when unsupported by the workspace. #76717

merged 4 commits into from
Jan 14, 2025

Conversation

JoeRobich
Copy link
Member

Doing this as part of the work to bring these extract refactorings to the LSP.

This PR does two things:

  1. It updates the ExtractInterfaceOptionsService to pull the services it needs from the document being worked against. This will have it work in the same manner as ExtractClassOptionsService. This also removes the need for Roslyn LSP or O# to implement an INotificationService since it is only needed in the VisualStudioExtractInferfaceOptionsService.
  2. A change was previously made to have extract class early return if the workspace did not support AddFile operations. The same change was not made for extract interface and both support extracting to a new file. This PR changes it so that extract class is supported again, however the option to extract to new file will be disabled when unsupported by the workspace.

@JoeRobich JoeRobich requested a review from a team as a code owner January 11, 2025 07:22
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-IDE untriaged Issues and PRs which have not yet been triaged by a lead labels Jan 11, 2025
JoeRobich
JoeRobich commented Jan 11, 2025
View reviewed changes
src/EditorFeatures/TestUtilities/ExtractInterface/TestExtractInterfaceOptions.cs
@@ -33,14 +31,12 @@ internal sealed class TestExtractInterfaceOptionsService() : IExtractInterfaceOp
public bool SameFile { get; set; }

public ExtractInterfaceOptionsResult GetExtractInterfaceOptions(
ISyntaxFactsService syntaxFactsService,
INotificationService notificationService,
Document document,
Copy link
Member Author

Choose a reason for hiding this comment

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

The services and language can be pulled from the document.

src/Features/Core/Portable/ExtractClass/AbstractExtractClassRefactoringProvider.cs
var solution = context.Document.Project.Solution;
if (!solution.CanApplyChange(ApplyChangesKind.AddDocument))
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 will now be handled by disabling the new file option on the extract dialog.

@JoeRobich JoeRobich added UX Review Not Required UX Review Not Required and removed Needs UX Triage labels Jan 11, 2025
@JoeRobich JoeRobich mentioned this pull request Jan 11, 2025
Merged
CyrusNajmabadi
CyrusNajmabadi reviewed Jan 13, 2025
View reviewed changes
src/VisualStudio/Core/Def/CommonControls/NewTypeDestinationSelectionViewModel.cs Outdated
@@ -20,7 +20,8 @@ internal class NewTypeDestinationSelectionViewModel : AbstractNotifyPropertyChan
string.Empty,
string.Empty,
[],
null
null,
false
Copy link
Member

Choose a reason for hiding this comment

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

named parameters.

CyrusNajmabadi
CyrusNajmabadi approved these changes Jan 13, 2025
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.

love the simplification.

@JoeRobich JoeRobich enabled auto-merge January 13, 2025 23:56
This was referenced Jan 14, 2025
Open
Open
@JoeRobich JoeRobich merged commit a01bddb into main Jan 14, 2025
25 checks passed
@dotnet-policy-service dotnet-policy-service bot added this to the Next milestone Jan 14, 2025
@CyrusNajmabadi CyrusNajmabadi deleted the dev/jorobich/rework-extract-options branch January 14, 2025 23:06
This was referenced Jan 16, 2025
Closed
Closed
Closed
Closed
@dotnet-bot dotnet-bot mentioned this pull request Jan 25, 2025
Closed
@dibarbet dibarbet modified the milestones: Next, 17.14 P1 Jan 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CyrusNajmabadi CyrusNajmabadi CyrusNajmabadi approved these changes

Assignees
No one assigned
Labels
Area-IDE untriaged Issues and PRs which have not yet been triaged by a lead UX Review Not Required UX Review Not Required VSCode
Projects
None yet
Milestone
17.14 P1
Development

Successfully merging this pull request may close these issues.
3 participants
@JoeRobich @CyrusNajmabadi @dibarbet