MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-13 15:52:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

[github] Fix 'fragment on Bot can't be spread' exceptions (IJPL-175710)

Browse Source 
#IJPL-175710 Fixed

This is caused by `... on Bot` not being allowed for `PullRequestReviewers` before GitHub 3.11.

The newly added tests can confirm this mistake.

(cherry picked from commit 87015863c0c8c0cd581f98eeefa5ae45adad34e8)

IJ-CR-154633


(cherry picked from commit 93d7bbd449b714c9a2f35c04aaf8e7168d73afcf)

IJ-CR-154633

GitOrigin-RevId: bc130a8de2e50e0faca7e1c1e89ec5063fc2b3cb
This commit is contained in:
Chris Lemaire
2025-02-03 22:55:57 +01:00
committed by intellij-monorepo-bot
parent 19f631779c
commit 3135a1e828
16 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/github/resources/graphql/fragment/actor.graphql
View File

@@ -1,13 +1,9 @@
fragment actor on Actor { fragment actor on Actor {
...actorInfo
... on User { ... on User {
...userInfo ...userInfo
} }
... on Bot {
...botInfo
}
... on Mannequin {
...mannequinInfo
}
... on EnterpriseUserAccount { ... on EnterpriseUserAccount {
...enterpriseUserAccountInfo ...enterpriseUserAccountInfo
} }

3
plugins/github/resources/graphql/fragment/botInfo.graphql
View File

@@ -1,3 +0,0 @@
fragment botInfo on Bot {
...actorInfo
}

1
plugins/github/resources/graphql/fragment/enterpriseUserAccountInfo.graphql
View File

@@ -1,4 +1,3 @@
fragment enterpriseUserAccountInfo on EnterpriseUserAccount { fragment enterpriseUserAccountInfo on EnterpriseUserAccount {
...actorInfo
name name
} }

2
plugins/github/resources/graphql/fragment/gitActorInfo.graphql
View File

@@ -4,6 +4,6 @@ fragment gitActorInfo on GitActor {
avatarUrl avatarUrl
date date
user { user {
...userInfo ...user
} }
} }

3
plugins/github/resources/graphql/fragment/mannequinInfo.graphql
View File

@@ -1,3 +0,0 @@
fragment mannequinInfo on Mannequin {
...actorInfo
}

1
plugins/github/resources/graphql/fragment/organizationInfo.graphql
View File

@@ -1,4 +1,3 @@
fragment organizationInfo on Organization { fragment organizationInfo on Organization {
...actorInfo
name name
} }

2
plugins/github/resources/graphql/fragment/pullRequestInfoShort.graphql
View File

@@ -17,7 +17,7 @@ fragment pullRequestInfoShort on PullRequest {
assignees(first: 100) { assignees(first: 100) {
nodes { nodes {
...userInfo ...user
} }
} }
labels(first: 100) { labels(first: 100) {

11
plugins/github/resources/graphql/fragment/pullRequestReviewer.graphql
View File

@@ -1,14 +1,13 @@
fragment pullRequestReviewer on RequestedReviewer { fragment pullRequestReviewer on RequestedReviewer {
... on Actor {
...actorInfo
}
... on User { ... on User {
...userInfo ...userInfo
} }
... on Team { ... on Team {
...teamInfo ...teamInfo
} }
... on Mannequin {
...mannequinInfo # For future enthusiasts: be careful with adding ... on Bot, as it's been added only in GHE 3.11
}
... on Bot {
...botInfo
}
} }

2
plugins/github/resources/graphql/fragment/reaction.graphql
View File

@@ -1,6 +1,6 @@
fragment reaction on Reaction { fragment reaction on Reaction {
content content
user { user {
...userInfo ...user
} }
} }

4
plugins/github/resources/graphql/fragment/user.graphql Normal file
View File

@@ -0,0 +1,4 @@
fragment user on User {
...actorInfo
...userInfo
}

1
plugins/github/resources/graphql/fragment/userInfo.graphql
View File

@@ -1,4 +1,3 @@
fragment userInfo on User { fragment userInfo on User {
...actorInfo
name name
} }

2
plugins/github/resources/graphql/query/findUser.graphql
View File

@@ -1,6 +1,6 @@
query($login: String!) { query($login: String!) {
user(login: $login) { user(login: $login) {
__typename __typename
...userInfo ...user
} }
} }

4
plugins/github/resources/graphql/query/pullRequestTimeline.graphql
View File

@@ -80,7 +80,7 @@ fragment assignedEvent on AssignedEvent {
} }
createdAt createdAt
user { user {
...userInfo ...user
} }
} }
@@ -90,7 +90,7 @@ fragment unassignedEvent on UnassignedEvent {
} }
createdAt createdAt
user { user {
...userInfo ...user
} }
} }

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

@@ -4,7 +4,7 @@ package org.jetbrains.plugins.github.api.data
import com.intellij.collaboration.api.dto.GraphQLFragment import com.intellij.collaboration.api.dto.GraphQLFragment
import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestRequestedReviewer import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestRequestedReviewer
@GraphQLFragment("/graphql/fragment/botInfo.graphql") @GraphQLFragment("/graphql/fragment/actorInfo.graphql")
class GHBot( class GHBot(
id: String, id: String,
override val login: String, override val login: String,

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

@@ -4,7 +4,7 @@ package org.jetbrains.plugins.github.api.data
import com.intellij.collaboration.api.dto.GraphQLFragment import com.intellij.collaboration.api.dto.GraphQLFragment
import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestRequestedReviewer import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestRequestedReviewer
@GraphQLFragment("/graphql/fragment/mannequinInfo.graphql") @GraphQLFragment("/graphql/fragment/actorInfo.graphql")
class GHMannequin( class GHMannequin(
id: String, id: String,
override val login: String, override val login: String,

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

@@ -5,7 +5,7 @@ import com.intellij.collaboration.api.dto.GraphQLFragment
import com.intellij.openapi.util.NlsSafe import com.intellij.openapi.util.NlsSafe
import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestRequestedReviewer import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestRequestedReviewer
@GraphQLFragment("/graphql/fragment/userInfo.graphql") @GraphQLFragment("/graphql/fragment/user.graphql")
class GHUser(id: String, class GHUser(id: String,
@NlsSafe override val login: String, @NlsSafe override val login: String,
override val url: String, override val url: String,