From c3cebbf8dd7bed489e4d0dfff638b9f99025992c Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Sat, 31 Aug 2024 00:03:31 +0200 Subject: [PATCH] move `ExperimentalUI` to `intellij.platform.core.ui` GitOrigin-RevId: 9bf55dab6a2d5c0be392634dd31b18efaf401b45 --- .../codeInsight/daemon/impl/analysis/HighlightUtil.java | 4 ++-- .../src/com/intellij => core-ui/src}/ui/ExperimentalUI.kt | 0 .../kotlin/idea/presentation/DeclarationPresenters.kt | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename platform/{platform-api/src/com/intellij => core-ui/src}/ui/ExperimentalUI.kt (100%) diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java index 9b2731091967..269980116596 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java @@ -55,7 +55,7 @@ import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.*; import com.intellij.refactoring.util.RefactoringChangeUtil; import com.intellij.ui.ColorUtil; -import com.intellij.ui.ExperimentalUI; +import com.intellij.ui.NewUI; import com.intellij.util.ArrayUtil; import com.intellij.util.ArrayUtilRt; import com.intellij.util.JavaPsiConstructorUtil; @@ -3448,7 +3448,7 @@ public final class HighlightUtil { typeText = type.getCanonicalText(); } Color color = matches - ? ExperimentalUI.isNewUI() ? JBUI.CurrentTheme.Editor.Tooltip.FOREGROUND : UIUtil.getToolTipForeground() + ? NewUI.isEnabled() ? JBUI.CurrentTheme.Editor.Tooltip.FOREGROUND : UIUtil.getToolTipForeground() : NamedColorUtil.getErrorForeground(); return HtmlChunk.tag("font").attr("color", ColorUtil.toHtmlColor(color)).addText(typeText); } diff --git a/platform/platform-api/src/com/intellij/ui/ExperimentalUI.kt b/platform/core-ui/src/ui/ExperimentalUI.kt similarity index 100% rename from platform/platform-api/src/com/intellij/ui/ExperimentalUI.kt rename to platform/core-ui/src/ui/ExperimentalUI.kt diff --git a/plugins/kotlin/base/analysis/src/org/jetbrains/kotlin/idea/presentation/DeclarationPresenters.kt b/plugins/kotlin/base/analysis/src/org/jetbrains/kotlin/idea/presentation/DeclarationPresenters.kt index 9a40c3bc799f..dabc80315aca 100644 --- a/plugins/kotlin/base/analysis/src/org/jetbrains/kotlin/idea/presentation/DeclarationPresenters.kt +++ b/plugins/kotlin/base/analysis/src/org/jetbrains/kotlin/idea/presentation/DeclarationPresenters.kt @@ -12,7 +12,7 @@ import com.intellij.openapi.editor.colors.TextAttributesKey import com.intellij.openapi.util.Iconable import com.intellij.openapi.util.NlsSafe import com.intellij.openapi.util.text.StringUtil -import com.intellij.ui.ExperimentalUI +import com.intellij.ui.NewUI import org.jetbrains.kotlin.idea.KotlinIconProvider import org.jetbrains.kotlin.idea.base.resources.KotlinBundle import org.jetbrains.kotlin.lexer.KtTokens @@ -125,7 +125,7 @@ class KtFunctionPresenter : ItemPresentationProvider { } internal fun getPresentationInContainer(param: Any): String { - if (ExperimentalUI.isNewUI() && !ApplicationManager.getApplication().isUnitTestMode) { + if (NewUI.isEnabled() && !ApplicationManager.getApplication().isUnitTestMode) { return KotlinBundle.message("presentation.text.in.container.paren.no.brackets", param) } else { return KotlinBundle.message("presentation.text.in.container.paren", param) @@ -133,7 +133,7 @@ internal fun getPresentationInContainer(param: Any): String { } internal fun getPresentationText(param: Any): String { - if (ExperimentalUI.isNewUI() && !ApplicationManager.getApplication().isUnitTestMode) { + if (NewUI.isEnabled() && !ApplicationManager.getApplication().isUnitTestMode) { return KotlinBundle.message("presentation.text.paren.no.brackets", param) } else { return KotlinBundle.message("presentation.text.paren", param)