Skip to content

Allow non-unique names in list of classes #2099

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

Merged
merged 2 commits into from
Apr 5, 2023
Merged

Allow non-unique names in list of classes #2099

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b22af4d
List of classes, displayed on plugin UI, may miss some items #2097
Vassiliy-Kudryashov Apr 5, 2023
178fd48
Merge branch 'main' into Vassiliy-Kudryashov/2097-list-of-classes-dis…
Vassiliy-Kudryashov Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import com.intellij.openapi.ui.OptionAction
import com.intellij.openapi.ui.ValidationInfo
import com.intellij.openapi.ui.popup.IconButton
import com.intellij.openapi.util.Computable
import com.intellij.openapi.util.text.StringUtil
import com.intellij.openapi.vfs.StandardFileSystems
import com.intellij.openapi.vfs.VfsUtil
import com.intellij.openapi.vfs.VfsUtilCore.urlToPath
Expand Down Expand Up @@ -155,11 +154,9 @@ import org.utbot.intellij.plugin.ui.utils.testRootType
import org.utbot.intellij.plugin.util.IntelliJApiHelper
import org.utbot.intellij.plugin.util.extractFirstLevelMembers
import org.utbot.intellij.plugin.util.findSdkVersion
import java.awt.Component
import java.time.LocalDateTime
import java.time.format.DateTimeFormatter
import java.util.*
import javax.swing.DefaultListCellRenderer

private const val RECENTS_KEY = "org.utbot.recents"

Expand Down Expand Up @@ -461,7 +458,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
srcClasses.flatMap { it.extractFirstLevelMembers(false) }
} else {
srcClasses.map { MemberInfo(it) }
}.toSortedSet { o1, o2 -> o1.displayName.compareTo(o2.displayName, true) }
}.toMutableList().sortedWith { o1, o2 -> o1.displayName.compareTo(o2.displayName, true) }

checkMembers(items)
membersTable.setMemberInfos(items)
Expand Down