Add (real) support for IDEA build 201 #295
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 3 commits
April 30, 2020 19:15
…nflicted state after the merge tool is dismissed & when the Y/N dialog shows up.
2 tasks
|
and #276 |
|
Brilliant! Thanks for the effort - I'll try and review over the weekend and hopefully get a version out for early next week 😄 |
|
The handleMerge() "logic" is really hacky but that's an issue with idea's apis, nothing we can do. I tried to improve it though. That's what took 80% of the time spent here. |
OpherV
reviewed
May 3, 2020
|
|
||
| @Nullable | ||
| @Override | ||
| public TaskDialogPanel getOpenTaskPanel(@NotNull Project project, @NotNull LocalTask task) { |
There was a problem hiding this comment.
Oh it's one of the deprecations. Nevermind :)
|
Getting this while testing this PR:
|
|
Solved by refactoring some of |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Following #288
Considering 2020 deprecations
and based on https://www.jetbrains.org/intellij/sdk/docs/basics/plugin_structure/plugin_components.html
Here is the support for the gitflow plugin on IDEA 201.