MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-21 22:11:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

[collab/ghai] Move AI comment background color into themeMetadata

Browse Source 
(cherry picked from commit 33933900541578ab3be434976d55136610c82991)


(cherry picked from commit 1ca2a6bcf53c84b1c30af9966b550ee9be52bdc6)

IJ-CR-148445

GitOrigin-RevId: a4b16470ab006d374e9174e6baa750a620d48497
This commit is contained in:
Chris Lemaire
2024-10-03 11:25:51 +02:00
committed by intellij-monorepo-bot
parent d2edb7242f
commit b423645739
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/collaboration-tools/api-dump-experimental.txt
View File

@@ -523,9 +523,6 @@ f:com.intellij.collaboration.api.json.JsonHttpApiHelperKt
- bs:create$default(com.intellij.collaboration.ui.codereview.changes.CodeReviewChangesTreeFactory,java.lang.String,Z,I,java.lang.Object):com.intellij.openapi.vcs.changes.ui.AsyncChangesTree
*f:com.intellij.collaboration.ui.codereview.changes.CodeReviewChangesTreeFactory$Companion
- f:createTreeToolbar(com.intellij.openapi.actionSystem.ActionManager,java.lang.String,javax.swing.JComponent):javax.swing.JComponent
*f:com.intellij.collaboration.ui.codereview.comment.CodeReviewAIUIUtil
- sf:INSTANCE:com.intellij.collaboration.ui.codereview.comment.CodeReviewAIUIUtil
- f:getAI_COLOR():java.awt.Color
*f:com.intellij.collaboration.ui.codereview.comment.CodeReviewCommentTextFieldFactory
- sf:INSTANCE:com.intellij.collaboration.ui.codereview.comment.CodeReviewCommentTextFieldFactory
- f:createIn(kotlinx.coroutines.CoroutineScope,com.intellij.collaboration.ui.codereview.comment.CodeReviewSubmittableTextViewModel,com.intellij.collaboration.ui.codereview.comment.CommentInputActionsComponentFactory$Config,com.intellij.collaboration.ui.codereview.timeline.comment.CommentTextFieldFactory$IconConfig):javax.swing.JComponent
@@ -1506,6 +1503,9 @@ f:com.intellij.collaboration.ui.codereview.diff.viewer.DiffViewerUtilKt
- sf:toAnAction(javax.swing.Action):com.intellij.openapi.actionSystem.AnAction
*f:com.intellij.collaboration.ui.util.CodeReviewColorUtil
- sf:INSTANCE:com.intellij.collaboration.ui.util.CodeReviewColorUtil
*f:com.intellij.collaboration.ui.util.CodeReviewColorUtil$AI
- sf:INSTANCE:com.intellij.collaboration.ui.util.CodeReviewColorUtil$AI
- f:getBackground():com.intellij.ui.JBColor
*f:com.intellij.collaboration.ui.util.CodeReviewColorUtil$Branch
- sf:INSTANCE:com.intellij.collaboration.ui.util.CodeReviewColorUtil$Branch
- f:getBackground():com.intellij.ui.JBColor

5
platform/collaboration-tools/resources/META-INF/CollaborationTools.themeMetadata.json
View File

@@ -101,6 +101,11 @@
"key": "Review.Notification.Blue",
"description": "Color of the notification dot in the list of reviews",
"since": "[2024.1]"
},
{
"key": "Review.AI.Background",
"description": "Background color of AI-generated comments",
"since": "[2024.3]"
}
]
}

8
platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/comment/CodeReviewAIUIUtil.kt
View File

@@ -1,8 +0,0 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.collaboration.ui.codereview.comment
import com.intellij.ui.ColorUtil
object CodeReviewAIUIUtil {
val AI_COLOR = ColorUtil.fromHex("834DF0")
}

4
platform/collaboration-tools/src/com/intellij/collaboration/ui/util/CodeReviewColorUtil.kt
View File

@@ -29,4 +29,8 @@ object CodeReviewColorUtil {
val borderReacted: JBColor = JBColor.namedColor("Review.Reaction.Border.Reacted", JBColor(0x3574F0, 0x548AF7))
}
object AI {
val background: JBColor = JBColor.namedColor("Review.AI.Background", JBColor(0x834DF0, 0x834DF0))
}
}

5
plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/editor/editorInlaysRenderers.kt
View File

@@ -1,8 +1,7 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.plugins.github.pullrequest.ui.editor
import com.intellij.collaboration.async.classAsCoroutineName
import com.intellij.collaboration.async.extensionListFlow
import com.intellij.collaboration.async.extensionListFlow
import com.intellij.collaboration.ui.codereview.editor.CodeReviewComponentInlayRenderer
import com.intellij.collaboration.ui.util.bindContent
import com.intellij.openapi.extensions.ExtensionPointName
@@ -36,7 +35,7 @@ interface GHPRAICommentComponentFactory {
internal class GHPRAICommentEditorInlayRenderer internal constructor(cs: CoroutineScope, userIcon: Icon, vm: GHPRAICommentViewModel)
: CodeReviewComponentInlayRenderer(Wrapper().apply {
bindContent("${classAsCoroutineName().name}.bindContent", GHPRAICommentComponentFactory.EP_NAME.extensionListFlow()) { extensions ->
bindContent("${javaClass.name}.bindContent", GHPRAICommentComponentFactory.EP_NAME.extensionListFlow()) { extensions ->
val extension = extensions.firstOrNull() ?: return@bindContent null
extension.createAIThread(cs, userIcon, vm)
}