From de50197379e298efcbca6aa37dc7dc96ae935251 Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Tue, 17 Jun 2025 16:55:18 +0200
Subject: [PATCH] IJPL-192086 Island themes: Host A/B notifications are shown
 on Client in Remote Development mode

GitOrigin-RevId: a7f16c773885257bb922e81e9adfabd9fd197361
---
 .../src/com/intellij/platform/ide/bootstrap/Islands.kt      | 3 ++-
 .../openapi/application/impl/islands/IslandsFeedback.kt     | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/Islands.kt b/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/Islands.kt
index 848ab1ee8ae5..ad4b8f45ab6f 100644
--- a/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/Islands.kt
+++ b/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/Islands.kt
@@ -5,6 +5,7 @@ import com.intellij.ide.plugins.PluginManagerCore
 import com.intellij.ide.ui.LafManager
 import com.intellij.ide.ui.laf.UiThemeProviderListManager
 import com.intellij.ide.util.PropertiesComponent
+import com.intellij.idea.AppMode
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.Experiments
 import com.intellij.openapi.editor.colors.EditorColorsManager
@@ -16,7 +17,7 @@ import org.jetbrains.annotations.ApiStatus
 @ApiStatus.Internal
 fun applyIslandsTheme(afterImportSettings: Boolean) {
   val application = ApplicationManager.getApplication()
-  if (PlatformUtils.isRider() || !application.isEAP || application.isUnitTestMode || application.isHeadlessEnvironment) {
+  if (PlatformUtils.isRider() || !application.isEAP || application.isUnitTestMode || application.isHeadlessEnvironment || AppMode.isRemoteDevHost()) {
     return
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/islands/IslandsFeedback.kt b/platform/platform-impl/src/com/intellij/openapi/application/impl/islands/IslandsFeedback.kt
index fbc4cb00411b..bfd49e822913 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/impl/islands/IslandsFeedback.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/islands/IslandsFeedback.kt
@@ -9,6 +9,7 @@ import com.intellij.ide.ui.AppearanceConfigurable
 import com.intellij.ide.ui.LafManager
 import com.intellij.ide.ui.LafManagerListener
 import com.intellij.ide.util.PropertiesComponent
+import com.intellij.idea.AppMode
 import com.intellij.notification.Notification
 import com.intellij.notification.NotificationAction
 import com.intellij.notification.NotificationType
@@ -38,7 +39,10 @@ internal class IslandsFeedback : ProjectActivity {
       return if (oneIsland) "https://surveys.jetbrains.com/s3/JetBrains-EAP-UI-Feedback-Survey" else "https://surveys.jetbrains.com/s3/Feedback-Survey-About-UI-EAP"
     }
 
-    private var myFirstProject = !PlatformUtils.isRider() && !ApplicationManager.getApplication().isUnitTestMode && !ApplicationManager.getApplication().isHeadlessEnvironment
+    private var myFirstProject = !PlatformUtils.isRider() &&
+                                 !ApplicationManager.getApplication().isUnitTestMode &&
+                                 !ApplicationManager.getApplication().isHeadlessEnvironment &&
+                                 !AppMode.isRemoteDevHost()
   }
 
   override suspend fun execute(project: Project) {