MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 23:39:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

[github] Rename file

Browse Source 
More accurate name

GitOrigin-RevId: 9507488948119c40a7652c1669e1e3450306fe87
This commit is contained in:
Ivan Semenov
2019-12-04 18:09:08 +03:00
committed by intellij-monorepo-bot
parent aef78b0446
commit 0dfea670b0
7 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/github/src/org/jetbrains/plugins/github/api/data/GHUser.kt
View File

@@ -1,11 +1,11 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.plugins.github.api.data
import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestReviewer
import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestRequestedReviewer
class GHUser(id: String,
override val login: String,
override val url: String,
override val avatarUrl: String,
val name: String?)
: GHNode(id), GHActor, GHPullRequestReviewer
: GHNode(id), GHActor, GHPullRequestRequestedReviewer

6
plugins/github/src/org/jetbrains/plugins/github/api/data/pullrequest/GHPullRequestReviewer.kt → plugins/github/src/org/jetbrains/plugins/github/api/data/pullrequest/GHPullRequestRequestedReviewer.kt
View File

@@ -8,11 +8,11 @@ import org.jetbrains.plugins.github.api.data.GHUser
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "__typename", visible = false)
@JsonSubTypes(
JsonSubTypes.Type(name = "User", value = GHUser::class),
JsonSubTypes.Type(name = "Team", value = GHPullRequestReviewer.Team::class)
JsonSubTypes.Type(name = "Team", value = GHPullRequestRequestedReviewer.Team::class)
)
interface GHPullRequestReviewer {
interface GHPullRequestRequestedReviewer {
// because we need scopes to access teams
class Team : GHPullRequestReviewer {
class Team : GHPullRequestRequestedReviewer {
override fun toString(): String {
return "Unknown Team"
}

2
plugins/github/src/org/jetbrains/plugins/github/api/data/pullrequest/GHPullRequestReviewRequest.kt
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.plugins.github.api.data.pullrequest
class GHPullRequestReviewRequest(val requestedReviewer: GHPullRequestReviewer?)
class GHPullRequestReviewRequest(val requestedReviewer: GHPullRequestRequestedReviewer?)

4
plugins/github/src/org/jetbrains/plugins/github/api/data/pullrequest/timeline/GHPRReviewRequestedEvent.kt
View File

@@ -2,10 +2,10 @@
package org.jetbrains.plugins.github.api.data.pullrequest.timeline
import org.jetbrains.plugins.github.api.data.GHActor
import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestReviewer
import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestRequestedReviewer
import java.util.*
class GHPRReviewRequestedEvent(override val actor: GHActor?,
override val createdAt: Date,
val requestedReviewer: GHPullRequestReviewer)
val requestedReviewer: GHPullRequestRequestedReviewer)
: GHPRTimelineEvent.Simple

4
plugins/github/src/org/jetbrains/plugins/github/api/data/pullrequest/timeline/GHPRReviewUnrequestedEvent.kt
View File

@@ -2,10 +2,10 @@
package org.jetbrains.plugins.github.api.data.pullrequest.timeline
import org.jetbrains.plugins.github.api.data.GHActor
import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestReviewer
import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestRequestedReviewer
import java.util.*
class GHPRReviewUnrequestedEvent(override val actor: GHActor?,
override val createdAt: Date,
val requestedReviewer: GHPullRequestReviewer)
val requestedReviewer: GHPullRequestRequestedReviewer)
: GHPRTimelineEvent.Simple

14
plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineEventComponentFactoryImpl.kt
View File

@@ -11,7 +11,7 @@ import org.intellij.lang.annotations.Language
import org.jetbrains.plugins.github.api.data.GHLabel
import org.jetbrains.plugins.github.api.data.GHUser
import org.jetbrains.plugins.github.api.data.pullrequest.GHGitRefName
import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestReviewer
import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestRequestedReviewer
import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestState
import org.jetbrains.plugins.github.api.data.pullrequest.timeline.*
import org.jetbrains.plugins.github.pullrequest.avatars.GHAvatarIconsProvider
@@ -105,8 +105,8 @@ class GHPRTimelineEventComponentFactoryImpl(private val avatarIconsProvider: GHA
return builder.toString()
}
private fun reviewersHTML(added: Collection<GHPullRequestReviewer> = emptyList(),
removed: Collection<GHPullRequestReviewer> = emptyList()): String {
private fun reviewersHTML(added: Collection<GHPullRequestRequestedReviewer> = emptyList(),
removed: Collection<GHPullRequestRequestedReviewer> = emptyList()): String {
val builder = StringBuilder()
if (added.isNotEmpty()) {
builder.append(added.joinToString(prefix = "requested a review from ") { "<b>${extractReviewerName(it)}</b>" })
@@ -118,10 +118,10 @@ class GHPRTimelineEventComponentFactoryImpl(private val avatarIconsProvider: GHA
return builder.toString()
}
private fun extractReviewerName(reviewer: GHPullRequestReviewer): String {
return when (reviewer) {
is GHUser -> reviewer.login
is GHPullRequestReviewer.Team -> "team"
private fun extractReviewerName(requestedReviewer: GHPullRequestRequestedReviewer): String {
return when (requestedReviewer) {
is GHUser -> requestedReviewer.login
is GHPullRequestRequestedReviewer.Team -> "team"
else -> throw IllegalArgumentException()
}
}

16
plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineMergedSimpleEvents.kt
View File

@@ -3,7 +3,7 @@ package org.jetbrains.plugins.github.pullrequest.ui.timeline
import org.jetbrains.plugins.github.api.data.GHLabel
import org.jetbrains.plugins.github.api.data.GHUser
import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestReviewer
import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestRequestedReviewer
import org.jetbrains.plugins.github.api.data.pullrequest.timeline.*
class GHPRTimelineMergedSimpleEvents : GHPRTimelineMergedEvents<GHPRTimelineEvent.Simple>(), GHPRTimelineEvent.Simple {
@@ -18,10 +18,10 @@ class GHPRTimelineMergedSimpleEvents : GHPRTimelineMergedEvents<GHPRTimelineEven
private val _unassignedPeople = mutableSetOf<GHUser>()
val unassignedPeople: Set<GHUser> get() = _unassignedPeople
private val _addedReviewers = mutableSetOf<GHPullRequestReviewer>()
val addedReviewers: Set<GHPullRequestReviewer> get() = _addedReviewers
private val _removedReviewers = mutableSetOf<GHPullRequestReviewer>()
val removedReviewers: Set<GHPullRequestReviewer> get() = _removedReviewers
private val _addedReviewers = mutableSetOf<GHPullRequestRequestedReviewer>()
val addedReviewers: Set<GHPullRequestRequestedReviewer> get() = _addedReviewers
private val _removedReviewers = mutableSetOf<GHPullRequestRequestedReviewer>()
val removedReviewers: Set<GHPullRequestRequestedReviewer> get() = _removedReviewers
private var _rename: Pair<String, String>? = null
val rename: Pair<String, String>? get() = _rename?.let { if (it.first != it.second) it else null }
@@ -34,8 +34,10 @@ class GHPRTimelineMergedSimpleEvents : GHPRTimelineMergedEvents<GHPRTimelineEven
is GHPRAssignedEvent -> if (!_unassignedPeople.remove(event.user)) _assignedPeople.add(event.user)
is GHPRUnassignedEvent -> if (!_assignedPeople.remove(event.user)) _unassignedPeople.add(event.user)
is GHPRReviewRequestedEvent -> if (!_removedReviewers.remove(event.requestedReviewer)) _addedReviewers.add(event.requestedReviewer)
is GHPRReviewUnrequestedEvent -> if (!_addedReviewers.remove(event.requestedReviewer)) _removedReviewers.add(event.requestedReviewer)
is GHPRReviewRequestedEvent -> if (!_removedReviewers.remove(event.requestedReviewer)) _addedReviewers.add(
event.requestedReviewer)
is GHPRReviewUnrequestedEvent -> if (!_addedReviewers.remove(event.requestedReviewer)) _removedReviewers.add(
event.requestedReviewer)
is GHPRRenamedTitleEvent -> _rename = (_rename?.first ?: event.previousTitle) to event.currentTitle
}