From cdc8a39bef3d0cb84c4c51f4d27070d7559033f3 Mon Sep 17 00:00:00 2001 From: Nikita Iarychenko Date: Tue, 2 Jun 2026 10:21:27 +0400 Subject: [PATCH] fix errors for 262 eap --- build/src/org/jetbrains/intellij/build/OpenIdeProperties.kt | 4 ++-- openide/src/ru/openide/OpenIdePluginBundler.kt | 2 +- .../src/com/intellij/ide/ActiveWindowsWatcher.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/src/org/jetbrains/intellij/build/OpenIdeProperties.kt b/build/src/org/jetbrains/intellij/build/OpenIdeProperties.kt index e03ac7c85bfc..5f342c33d473 100644 --- a/build/src/org/jetbrains/intellij/build/OpenIdeProperties.kt +++ b/build/src/org/jetbrains/intellij/build/OpenIdeProperties.kt @@ -23,7 +23,7 @@ open class OpenIdeProperties(val communityHomeDir: Path): IdeaCommunityPropertie override val baseFileName: String = "openide" override fun createWindowsCustomizer(projectHome: Path): WindowsDistributionCustomizer = openideWindowsCustomizer(communityHomeDir) - override fun createLinuxCustomizer(projectHome: String): LinuxDistributionCustomizer = openideLinuxCustomizer(communityHomeDir) + override fun createLinuxCustomizer(projectHome: Path): LinuxDistributionCustomizer = openideLinuxCustomizer(communityHomeDir) override fun createMacCustomizer(projectHome: Path): MacDistributionCustomizer = openideMacCustomizer(communityHomeDir) override fun getSystemSelector(appInfo: ApplicationInfoProperties, buildNumber: String): String { @@ -49,7 +49,7 @@ inline fun openideWindowsCustomizer(projectHome: Path, configure: WindowsCustomi fullName { "OpenIDE" } - fullNameAndVendor { "OpenIDE" } + installDirNameHandler { "OpenIDE" } // Apply user configuration configure() diff --git a/openide/src/ru/openide/OpenIdePluginBundler.kt b/openide/src/ru/openide/OpenIdePluginBundler.kt index 08f3271416ea..b4a7fee3e1f8 100644 --- a/openide/src/ru/openide/OpenIdePluginBundler.kt +++ b/openide/src/ru/openide/OpenIdePluginBundler.kt @@ -31,7 +31,7 @@ object OpenIdePluginBundler { private val plugins = listOf( PluginInfo("com.haulmont.intellij.rupack", "ru_pack"), - PluginInfo("com.haulmont.amplicode", "amplicode", version = "2025.3.2-261"), + PluginInfo("com.haulmont.amplicode", "amplicode"), PluginInfo("ru.openide.pro.updater", "updater") ) diff --git a/platform/platform-impl/src/com/intellij/ide/ActiveWindowsWatcher.kt b/platform/platform-impl/src/com/intellij/ide/ActiveWindowsWatcher.kt index 65cdff236e92..d79441763abb 100644 --- a/platform/platform-impl/src/com/intellij/ide/ActiveWindowsWatcher.kt +++ b/platform/platform-impl/src/com/intellij/ide/ActiveWindowsWatcher.kt @@ -71,7 +71,7 @@ private fun adjacentWindow(current: Window, delta: Int, activatedWindows: Collec private fun getWindows(current: Window, activatedWindows: Collection): List { - if (SystemInfoRt.isMac && SystemInfo.isJetBrainsJvm && activatedWindows.size > 1) { + if (SystemInfoRt.isMac && SystemInfo.isIDEOptimizedJvm && activatedWindows.size > 1) { return activatedWindows .asSequence() .filter { it === current || isIncludedInWindowSwitchOrder(it) }