OK action is enabled if all members are deselected #168#238
Merged
Vassiliy-Kudryashov merged 5 commits intomainfrom Jun 22, 2022
Conversation
3 tasks
Vassiliy-Kudryashov
force-pushed
the
Vassiliy-Kudryashov/168-ok-action-is-enabled-if-all-members-are-deselected
branch
2 times, most recently
from
9ae9a68 to
4166ee4
Compare
EgorkaKulikov
requested changes
Jun 22, 2022
| import com.intellij.openapi.roots.ExternalLibraryDescriptor | ||
| import com.intellij.openapi.roots.JavaProjectModelModificationService | ||
| import com.intellij.openapi.roots.ModuleRootManager | ||
| import com.intellij.openapi.roots.* |
Collaborator
There was a problem hiding this comment.
We do not use imports with * by some reasons. Correct this setting in your IntelliJ Idea and in the already commited files after that, please.
| val item = (event.source as JComboBox<*>).selectedItem as String | ||
|
|
||
| pathToFile(item)?.let { model.testSourceRoot = it } | ||
| pathToFile(item)?.let { model.testSourceRoot = it } ?: run { model.testSourceRoot = null } |
Collaborator
There was a problem hiding this comment.
It seems to me that you have just mentioned smth like
model.testSourceRoot = pathToFile(item)
utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt
Show resolved
Hide resolved
| } | ||
| return true | ||
| if (cbSpecifyTestPackage.isSelected) { | ||
| createSelectedPackage(sourceRootAndEntry.first) |
Collaborator
There was a problem hiding this comment.
Such code is not very easy to understand... What is "first"? How to understand that it is actually the testSourceRoot. I would suggest to use something like named tuples or a structure.
Collaborator
There was a problem hiding this comment.
val (a, b) = getAOrb()
| WriteCommandAction.runWriteCommandAction(model.project) { modifiableModel.commit() } | ||
| private fun getRootDirectoryAndContentEntry() : Pair<VirtualFile, ContentEntry>? { | ||
| val testSourceRoot = model.testSourceRoot ?: return null | ||
| if (!testSourceRoot.isDirectory) return null |
Collaborator
There was a problem hiding this comment.
Can't we incapsulate this logic just in one place, for example, in doValidate method?
| if (testSourceRoot == null || !testSourceRoot.isDirectory) { | ||
| return ValidationInfo("Test source root is not configured", testSourceFolderField.childComponent) | ||
| } | ||
| if (getRootDirectoryAndContentEntry() == null) { |
Collaborator
There was a problem hiding this comment.
Actually here you check just it's "second" as "first" is checked in the previous condition.
| override fun doValidate(): ValidationInfo? { | ||
| val testSourceRoot = model.testSourceRoot | ||
| if (testSourceRoot == null || !testSourceRoot.isDirectory) { | ||
| return ValidationInfo("Test source root is not configured", testSourceFolderField.childComponent) |
Collaborator
There was a problem hiding this comment.
Actually we have another validator for it.
EgorkaKulikov
approved these changes
Jun 22, 2022
After-review improvements
Vassiliy-Kudryashov
force-pushed
the
Vassiliy-Kudryashov/168-ok-action-is-enabled-if-all-members-are-deselected
branch
from
28a8cf4 to
6b9eb8c
Compare
…-if-all-members-are-deselected
…-if-all-members-are-deselected
…-if-all-members-are-deselected
Vassiliy-Kudryashov
deleted the
Vassiliy-Kudryashov/168-ok-action-is-enabled-if-all-members-are-deselected
branch
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Description
Now OK button is disabled if no members is selected (ticked), better validation and hints were added for:
Fixes #168
Type of Change
How Has This Been Tested?
Manual Scenario
Checklist (remove irrelevant options):