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

feat: conflict changes filter #14

Open
kpatenio opened this issue Nov 16, 2020 · 0 comments
Open

feat: conflict changes filter #14

kpatenio opened this issue Nov 16, 2020 · 0 comments
Assignees
Labels
3 way diff Related to the IntelliJ 3 way diff functionality

Comments

@kpatenio
Copy link
Collaborator

Description

Provide an option for extra filtering for the merge conflict explanations on the on-hover popup for the 3 way diff. Options will include:

  • refactorings
  • moves
  • deletes
  • additions
  • modifications

For refactorings, we can limit to a few types (and probably the most common) for the time being like:

  • rename class
  • move class
  • move method
  • move attribute
  • extract method

Sample design

Filter button at the top

image

New window for filter

image

New changes after deselecting move attribute

image

Planned setup

Refactorings

Will have to filter the types of refactorings according to what is outputted from RefactoringMiner
See #13.

Additions, deletions, updates, moves

We would have to rely on GumTree or CLDiff for filtering specific modifications. For general changes according to a textual diff, using git4idea should suffice.

@kpatenio kpatenio added the 3 way diff Related to the IntelliJ 3 way diff functionality label Nov 16, 2020
@kpatenio kpatenio self-assigned this Nov 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3 way diff Related to the IntelliJ 3 way diff functionality
Projects
None yet
Development

No branches or pull requests

1 participant