fix compile errors for 261 eap

build/src/org/jetbrains/intellij/build/IdeaCommunityProperties.kt

@@ -204,7 +204,7 @@ fun intellijCommunityBaseFragment(platformPrefix: String? = null): ProductModule
   }
 
   include(CommunityProductFragments.javaIdeBaseFragment())
-  deprecatedInclude("intellij.idea.community.customization", "META-INF/tips-intellij-idea-community.xml")
+  deprecatedInclude("org.openide.ideTipsAndTricks", "ideTipsAndTricks.xml")
 
   moduleSet(CommunityModuleSets.debuggerStreams())
 

build/src/org/jetbrains/intellij/build/OpenIdeProperties.kt

@@ -13,6 +13,7 @@
 // along with this program. If not, see http://www.gnu.org/licenses/.
 package org.jetbrains.intellij.build
 
+import kotlinx.collections.immutable.plus
 import org.jetbrains.intellij.build.kotlin.KotlinBinaries
 import ru.openide.OpenIdePluginBundler
 import java.nio.file.Path
@@ -21,67 +22,9 @@ open class OpenIdeProperties(val communityHomeDir: Path): IdeaCommunityPropertie
 
   override val baseFileName: String = "openide"
 
-  override fun createWindowsCustomizer(projectHome: String): WindowsDistributionCustomizer = OpenIdeWindowsDistributionCustomizer()
-  override fun createLinuxCustomizer(projectHome: String): LinuxDistributionCustomizer = OpenIdeLinuxDistributionCustomizer()
-  override fun createMacCustomizer(projectHome: String): MacDistributionCustomizer = OpenIdeMacDistributionCustomizer()
-
-  protected open inner class OpenIdeWindowsDistributionCustomizer : WindowsDistributionCustomizer() {
-    init {
-      icoPath = "${communityHomeDir}/build/conf/openIDE/win/images/openide.ico"
-      icoPathForEAP = "${communityHomeDir}/build/conf/openIDE/win/images/openide_eap.ico"
-      installerImagesPath = "${communityHomeDir}/build/conf/openIDE/win/images"
-      fileAssociations = listOf("java", "gradle", "groovy", "kt", "kts", "pom")
-    }
-
-    override fun getFullNameIncludingEdition(appInfo: ApplicationInfoProperties) = "OpenIDE"
-
-    override fun getFullNameIncludingEditionAndVendor(appInfo: ApplicationInfoProperties) = "OpenIDE"
-  }
-
-  protected open inner class OpenIdeLinuxDistributionCustomizer : LinuxDistributionCustomizer() {
-    init {
-      iconPngPath = "${communityHomeDir}/build/conf/openIDE/linux/images/openide_128.png"
-      iconPngPathForEAP = "${communityHomeDir}/build/conf/openIDE/linux/images/openide_eap_128.png"
-      snapName = "open-ide"
-      snapDescription =
-        "The most intelligent Java IDE. Every aspect of OpenIDE is specifically designed to maximize developer productivity. " +
-        "Together, powerful static code analysis and ergonomic design make development not only productive but also an enjoyable experience."
-    }
-
-    override fun getRootDirectoryName(appInfo: ApplicationInfoProperties, buildNumber: String) = "openIDE-$buildNumber"
-
-    override fun generateExecutableFilesPatterns(context: BuildContext, includeRuntime: Boolean, arch: JvmArchitecture, targetLibcImpl: LibcImpl): Sequence<String> =
-      super.generateExecutableFilesPatterns(context, includeRuntime, arch, targetLibcImpl)
-        .plus(KotlinBinaries.kotlinCompilerExecutables)
-        .filterNot { it == "plugins/**/*.sh" }
-  }
-
-  protected open inner class OpenIdeMacDistributionCustomizer : MacDistributionCustomizer() {
-    init {
-      icnsPath = "${communityHomeDir}/build/conf/openIDE/mac/images/openide.icns"
-      icnsPathForEAP = "${communityHomeDir}/build/conf/openIDE/mac/images/openide_eap.icns"
-      urlSchemes = listOf("idea")
-      associateIpr = true
-      fileAssociations = FileAssociation.from("java", "groovy", "kt", "kts")
-      bundleIdentifier = "ru.openide"
-      dmgImagePath = "${communityHomeDir}/build/conf/openIDE/mac/images/dmg_background.tiff"
-    }
-
-    override fun getRootDirectoryName(appInfo: ApplicationInfoProperties, buildNumber: String): String {
-      return if (appInfo.isEAP) {
-        "OpenIDE ${appInfo.majorVersion}.${appInfo.minorVersionMainPart} EAP.app"
-      }
-      else {
-        "OpenIDE.app"
-      }
-    }
-
-    override fun generateExecutableFilesPatterns(context: BuildContext, includeRuntime: Boolean, arch: JvmArchitecture): Sequence<String> {
-      return super.generateExecutableFilesPatterns(context, includeRuntime, arch)
-        .plus(KotlinBinaries.kotlinCompilerExecutables)
-        .filterNot { it == "plugins/**/*.sh" }
-    }
-  }
+  override fun createWindowsCustomizer(projectHome: Path): WindowsDistributionCustomizer = openideWindowsCustomizer(communityHomeDir)
+  override fun createLinuxCustomizer(projectHome: String): LinuxDistributionCustomizer = openideLinuxCustomizer(communityHomeDir)
+  override fun createMacCustomizer(projectHome: Path): MacDistributionCustomizer = openideMacCustomizer(communityHomeDir)
 
   override fun getSystemSelector(appInfo: ApplicationInfoProperties, buildNumber: String): String {
     return "OpenIDE${appInfo.majorVersion}.${appInfo.minorVersionMainPart}"
@@ -94,4 +37,74 @@ open class OpenIdeProperties(val communityHomeDir: Path): IdeaCommunityPropertie
   override suspend fun getAdditionalPluginPaths(context: BuildContext): List<Path> {
     return OpenIdePluginBundler.getBundlePluginPaths(context)
   }
+}
+
+inline fun openideWindowsCustomizer(projectHome: Path, configure: WindowsCustomizerBuilder.() -> Unit = {}): WindowsDistributionCustomizer {
+  return windowsCustomizer(projectHome) {
+    // Set Community defaults
+    icoPath = "build/conf/openIDE/win/images/openide.ico"
+    icoPathForEAP = "build/conf/openIDE/win/images/openide_eap.ico"
+    installerImagesPath = "build/conf/openIDE/win/images"
+    fileAssociations = listOf("java", "gradle", "groovy", "kt", "kts", "pom")
+
+    fullName { "OpenIDE" }
+
+    fullNameAndVendor { "OpenIDE" }
+
+    // Apply user configuration
+    configure()
+  }
+}
+
+inline fun openideLinuxCustomizer(projectHome: Path, configure: LinuxCustomizerBuilder.() -> Unit = {}): LinuxDistributionCustomizer {
+  return linuxCustomizer(projectHome) {
+    // Set Community defaults
+    iconPngPath = "build/conf/openIDE/linux/images/openide_128.png"
+    iconPngPathForEAP = "build/conf/openIDE/linux/images/openide_eap_128.png"
+    snaps += LinuxDistributionCustomizer.Snap(
+      name = "open-ide",
+      description =
+        "The most intelligent Java IDE. Every aspect of OpenIDE is specifically designed to maximize developer productivity. " +
+        "Together, powerful static code analysis and ergonomic design make development not only productive but also an enjoyable experience."
+    )
+
+    rootDirectoryName { _, buildNumber -> "openIDE-$buildNumber" }
+
+    executableFilePatterns { base, _, _, _, _ ->
+      base.plus(KotlinBinaries.kotlinCompilerExecutables).filterNot { it == "plugins/**/*.sh" }
+    }
+
+    // Apply user configuration
+    configure()
+  }
+}
+
+inline fun openideMacCustomizer(projectHome: Path, configure: MacCustomizerBuilder.() -> Unit = {}): MacDistributionCustomizer {
+  return macCustomizer(projectHome) {
+    // Set Community defaults
+    icnsPath = "build/conf/openIDE/mac/images/openide.icns"
+    icnsPathForEAP = "build/conf/openIDE/mac/images/openide_eap.icns"
+    urlSchemes = listOf("idea")
+    associateIpr = true
+    fileAssociations = FileAssociation.from("java", "groovy", "kt", "kts")
+    bundleIdentifier = "ru.openide"
+    dmgImagePath = "build/conf/openIDE/mac/images/dmg_background.tiff"
+
+    rootDirectoryName { appInfo, buildNumber ->
+      if (appInfo.isEAP) {
+        "OpenIDE ${appInfo.majorVersion}.${appInfo.minorVersionMainPart} EAP.app"
+      }
+      else {
+        "OpenIDE.app"
+      }
+    }
+
+    executableFilePatterns { base, includeRuntime, arch, context ->
+      val kotlinExecutables = org.jetbrains.intellij.build.kotlin.KotlinBinaries.kotlinCompilerExecutables
+      (base + kotlinExecutables).filterNot { it == "plugins/**/*.sh" }
+    }
+
+    // Apply user configuration
+    configure()
+  }
 }

jps/model-impl/testSrc/org/jetbrains/jps/model/JdkVariantDetectorTest.kt

@@ -10,6 +10,7 @@ import com.intellij.util.system.CpuArch
 import org.jetbrains.jps.model.java.JdkVersionDetector
 import org.jetbrains.jps.model.java.JdkVersionDetector.Variant.AdoptOpenJdk_HS
 import org.jetbrains.jps.model.java.JdkVersionDetector.Variant.AdoptOpenJdk_J9
+import org.jetbrains.jps.model.java.JdkVersionDetector.Variant.Axiom
 import org.jetbrains.jps.model.java.JdkVersionDetector.Variant.BiSheng
 import org.jetbrains.jps.model.java.JdkVersionDetector.Variant.Corretto
 import org.jetbrains.jps.model.java.JdkVersionDetector.Variant.Dragonwell

platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListModelBuilder.java

@@ -43,10 +43,12 @@ import org.jetbrains.jps.model.java.JdkVersionDetector;
 
 import javax.swing.JComponent;
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.EventListener;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Predicate;

platform/platform-resources/src/META-INF/LangExtensions.xml

@@ -832,9 +832,9 @@
       instance="com.intellij.application.options.CodeCompletionConfigurable"
       id="editor.preferences.completion.popup"
     />
-    <editorCompletionConfigurable
-      instance="com.intellij.codeInsight.inline.completion.options.InlineCompletionConfigurable"
-      id="editor.preferences.completion.inline"/>
+    <!--<editorCompletionConfigurable-->
+    <!--  instance="com.intellij.codeInsight.inline.completion.options.InlineCompletionConfigurable"-->
+    <!--  id="editor.preferences.completion.inline"/>-->
 
     <projectConfigurable instance="com.intellij.application.options.editor.AutoImportOptionsConfigurable"
                          id="editor.preferences.import"

plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/data/WizardMockData.kt

@@ -144,6 +144,7 @@ class WizardPluginImpl(
   override val name: String,
   override val description: String? = null,
   override val id: String = UUID.randomUUID().toString(),
+  override val bundled: Boolean = false
 ) : WizardPlugin
 
 class WizardPluginGroupImpl(