IJPL-149894 Darcula editor color scheme is enabled for Dark UI theme when the settings are imported from another JB IDE where the Classic UI was enabled

GitOrigin-RevId: 69be19f658deb41bb7e6114096adc417c60b27c0

platform/lang-impl/src/com/intellij/ui/ExperimentalUIImpl.kt

@@ -67,6 +67,7 @@ private class ExperimentalUIImpl : ExperimentalUI() {
     }
     else if (!prevNewUi && newUi) {
       isResetLaf.set(true)
+      wasThemeReset = true
 
       enabled = true
       setNewUiUsed()

platform/platform-api/src/com/intellij/ui/ExperimentalUI.kt

@@ -34,6 +34,7 @@ abstract class ExperimentalUI {
     // Should be unset by the client, or it will be unset on the IDE close.
     const val NEW_UI_SWITCH: String = "experimental.ui.switch"
     var forcedSwitchedUi: Boolean = false
+    var wasThemeReset = false
 
     @Internal
     val EP_LISTENER: ExtensionPointName<Listener> = ExtensionPointName("com.intellij.uiChangeListener")

plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbSettingsImporter.kt

@@ -83,7 +83,7 @@ class JbSettingsImporter(private val configDirPath: Path,
         KeymapManager.getInstance()
         componentStore.reloadState(KeymapManagerImpl::class.java)
       }
-      if (categories.contains(SettingsCategory.UI)) {
+      if (categories.contains(SettingsCategory.UI) && !ExperimentalUI.wasThemeReset) {
         // ensure component is loaded
         LafManager.getInstance()
         EditorColorsManager.getInstance()