MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[gitlab] comments navigation for many drafts in the same position

Browse Source 
Use correct comparator for DiscussionIdAndMappedPosition to avoid missing drafts if they are attached to the same line

Fixed IJPL-249453

GitOrigin-RevId: 9a48e9c9b10c9dde4e8db3a0ff47ecd00a5110d2
This commit is contained in:
Valeria Golovina
2026-07-21 16:29:27 +00:00
committed by intellij-monorepo-bot
parent 36025263e3
commit dd5059236f
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gitlab/gitlab-core/src/org/jetbrains/plugins/gitlab/mergerequest/ui/review/GitLabMergeRequestDiscussionsViewModels.kt
+12 -13
View File
@@ -238,25 +238,22 @@ internal class GitLabMergeRequestDiscussionsViewModelsImpl(
lookupAdjacentComment(currentThreadId, isNext = false, isVisible)
private fun lookupAdjacentComment(cursorLocation: UnifiedCodeReviewItemPosition, isNext: Boolean, isVisible: (String) -> Boolean): String? {
// Fetch stuff
val threads = allDiscussionsOrder.value ?: return null
if (threads.isEmpty()) return null
// Search from before the first comment on the selected line
var location: DiscussionIdAndMappedPosition? = DiscussionIdAndMappedPosition(null, Date.from(EPOCH), cursorLocation)
val cursorPosition = DiscussionIdAndMappedPosition("", Date.from(EPOCH), cursorLocation)
// Find the next or previous comment
location = when (isNext) {
true -> threads.ceiling(location)
false -> threads.floor(location)
val adjacentThread = when (isNext) {
true -> threads.ceiling(cursorPosition)
false -> threads.floor(cursorPosition)
}
if (adjacentThread == null) return null
return if (location?.id == null || isVisible(location.id)) {
return location?.id
}
else {
lookupAdjacentComment(location.id, isNext, isVisible)
return if (isVisible(adjacentThread.id)) {
adjacentThread.id
}
else lookupAdjacentComment(adjacentThread.id, isNext, isVisible)
}
private fun lookupAdjacentComment(currentThreadId: String, isNext: Boolean, isVisible: (String) -> Boolean): String? {
@@ -307,8 +304,10 @@ internal class GitLabMergeRequestDiscussionsViewModelsImpl(
))
}
}) { locations ->
// the same date will be used for all drafts when they are loaded from gitlab server, so ids are important
TreeSet(Comparator<DiscussionIdAndMappedPosition> { left, right -> comparator.compare(left.mappedPosition, right.mappedPosition) }
.thenComparing { left, right -> left.createdAt.compareTo(right.createdAt) })
.thenComparing { left, right -> left.createdAt.compareTo(right.createdAt) }
.thenComparing { left, right -> left.id.compareTo(right.id) })
.apply { addAll(locations.filterNotNull()) }
}
}
@@ -338,7 +337,7 @@ private data class IntermediateDiscussionData(
)
private data class DiscussionIdAndMappedPosition(
val id: String?,
val id: String,
val createdAt: Date,
val mappedPosition: UnifiedCodeReviewItemPosition,
)