[IFT] Make Java to be the default IFT language for the Aqua also

GitOrigin-RevId: 59628cbb3691906264cb9dad81f2d7fb01e7fbd8
This commit is contained in:
Alexey Merkulov
2023-06-07 18:51:46 +02:00
committed by intellij-monorepo-bot
parent f40fcc031e
commit bf31a7f0c6
2 changed files with 2 additions and 2 deletions

View File

@@ -1,6 +1,6 @@
<idea-plugin>
<extensions defaultExtensionNs="training">
<ift.language.extension language="JAVA" defaultProductName="IDEA" implementationClass="com.intellij.java.ift.JavaLangSupport"/>
<ift.language.extension language="JAVA" defaultProductName="IDEA,Aqua" implementationClass="com.intellij.java.ift.JavaLangSupport"/>
<ift.learning.course language="JAVA" implementationClass="com.intellij.java.ift.JavaLearningCourse"/>
<ifs.suggesterSupport language="JAVA" implementationClass="com.intellij.java.ifs.JavaSuggesterSupport"/>
</extensions>

View File

@@ -34,7 +34,7 @@ class LangManager : SimplePersistentStateComponent<LangManager.State>(State()) {
val langSupportBeans = languages
val onlyLang =
langSupportBeans.singleOrNull()
?: langSupportBeans.singleOrNull { it.defaultProductName == productName }
?: langSupportBeans.singleOrNull { it.defaultProductName?.split(",")?.contains(productName) ?: false }
?: langSupportBeans.firstOrNull()?.also {
if (!ApplicationManager.getApplication().isUnitTestMode) {
logger<LangManager>().warn("No default language for $productName. Selected ${it.language}.")