diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/pullrequest/timeline/GHPRTimelineItem.kt b/plugins/github/src/org/jetbrains/plugins/github/api/data/pullrequest/timeline/GHPRTimelineItem.kt index a7bfea13dd07..0539f2c17d58 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/pullrequest/timeline/GHPRTimelineItem.kt +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/pullrequest/timeline/GHPRTimelineItem.kt @@ -15,7 +15,6 @@ PullRequestReview RenamedTitleEvent ClosedEvent | ReopenedEvent | MergedEvent -ReferencedEvent AssignedEvent | UnassignedEvent LabeledEvent | UnlabeledEvent ReviewRequestedEvent | ReviewRequestRemovedEvent @@ -50,12 +49,15 @@ DeployedEvent DeploymentEnvironmentChangedEvent PullRequestReviewThread PinnedEvent | UnpinnedEvent -MentionedEvent SubscribedEvent | UnsubscribedEvent MilestonedEvent | DemilestonedEvent ConnectedEvent | DisconnectedEvent AutomaticBaseChangeSucceededEvent | AutomaticBaseChangeFailedEvent */ +/*IGNORE +ReferencedEvent +MentionedEvent + */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "__typename", visible = true, defaultImpl = Unknown::class) @JsonSubTypes( @@ -90,4 +92,8 @@ AutomaticBaseChangeSucceededEvent | AutomaticBaseChangeFailedEvent ) interface GHPRTimelineItem { class Unknown(val __typename: String) : GHPRTimelineItem + + companion object { + val IGNORED_TYPES = setOf("ReferencedEvent", "MentionedEvent") + } } \ No newline at end of file diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineMergingModel.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineMergingModel.kt index fd55d8431713..78587907b6a7 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineMergingModel.kt +++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineMergingModel.kt @@ -27,7 +27,7 @@ class GHPRTimelineMergingModel : AbstractListModel() { var added = false val hideUnknown = ApplicationManager.getApplication().let { !it.isInternal && !it.isEAP } for (item in items) { - if (hideUnknown && item is GHPRTimelineItem.Unknown) continue + if (item is GHPRTimelineItem.Unknown && (hideUnknown || item.__typename in GHPRTimelineItem.IGNORED_TYPES)) continue val merged = mergeIfPossible(lastItem, item) if (merged != null) { lastItem = merged