chore: 253 support

Author: gmyasoedov

build.gradle.kts

@@ -1,5 +1,4 @@
-import org.gradle.api.tasks.compile.JavaCompile
-import org.gradle.api.tasks.testing.Test
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 buildscript {
@@ -37,9 +36,9 @@ subprojects {
     java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
     tasks.withType<KotlinJvmCompile>().configureEach {
-        kotlinOptions {
-            jvmTarget = java.toolchain.languageVersion.get().toString()
-            freeCompilerArgs += listOf("-Xjvm-default=all-compatibility", "-Xjsr305=strict")
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_21)
+            freeCompilerArgs.addAll("-Xjvm-default=all-compatibility", "-Xjsr305=strict")
         }
     }
 

gradle.properties

@@ -6,14 +6,14 @@ org.gradle.parallel=true
 # Let Gradle choose optimal workers; override with ORG_GRADLE_PROJECT_org_gradle_workers_max if needed
 # org.gradle.workers.max=0
 kotlin.stdlib.default.dependency=false
-
-kotlinVersion=2.1.20
-gradleIntellijPluginVersion=2.7.0
-defaultIdeaVersion=2025.2
+kotlinVersion=2.2.0
+gradleIntellijPluginVersion=2.10.4
+#defaultIdeaVersion=2025.2
+defaultIdeaVersion=253-EAP-SNAPSHOT
 defaultIdeaType=IC
 org.jetbrains.intellij.platform.selfUpdateCheck=false
 org.jetbrains.intellij.platform.downloadSources=true
-sinceVersion=252.23892.409
-untilVersion=256.*
+sinceVersion=253
+untilVersion=265.*
 kotlin.daemon.jvmargs=-Xmx2G
 pluginVersion=29

modules/base/base.gradle.kts

@@ -55,8 +55,9 @@ dependencies {
         exclude(group = "com.fasterxml.jackson.core", module = "jackson-core")
     }
     intellijPlatform {
-        create(defaultIdeaType, defaultIdeaVersion, useInstaller = false)
-        jetbrainsRuntime()
+        intellijIdea(defaultIdeaVersion) {
+            useInstaller = false
+        }
         bundledPlugins(intellijPlugins)
     }
 }

modules/base/src/main/kotlin/com/explyt/inspection/SpringBaseUastLocalInspectionTool.kt

@@ -18,13 +18,17 @@
 package com.explyt.inspection
 
 import com.explyt.base.LibraryClassCache
+import com.explyt.plugin.PluginIds
 import com.explyt.util.SpringBaseClasses.CORE_ENVIRONMENT
 import com.intellij.codeInspection.AbstractBaseUastLocalInspectionTool
 import com.intellij.psi.PsiFile
 
 abstract class SpringBaseUastLocalInspectionTool : AbstractBaseUastLocalInspectionTool() {
 
     override fun isAvailableForFile(file: PsiFile): Boolean {
-        return LibraryClassCache.searchForLibraryClass(file.project, CORE_ENVIRONMENT) != null
+        return PluginIds.SPRING_JB.isNotEnabled() && LibraryClassCache.searchForLibraryClass(
+            file.project,
+            CORE_ENVIRONMENT
+        ) != null
     }
 }

modules/base/src/main/kotlin/com/explyt/plugin/PluginUtils.kt

@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2025 Explyt Ltd
+ *
+ * All rights reserved.
+ *
+ * This code and software are the property of Explyt Ltd and are protected by copyright and other intellectual property laws.
+ *
+ * You may use this code under the terms of the Explyt Source License Version 1.0 ("License"), if you accept its terms and conditions.
+ *
+ * By installing, downloading, accessing, using, or distributing this code, you agree to the terms and conditions of the License.
+ * If you do not agree to such terms and conditions, you must cease using this code and immediately delete all copies of it.
+ *
+ * You may obtain a copy of the License at: https://github.com/explyt/spring-plugin/blob/main/EXPLYT-SOURCE-LICENSE.md
+ *
+ * Unauthorized use of this code constitutes a violation of intellectual property rights and may result in legal action.
+ */
+
+package com.explyt.plugin
+
+import com.intellij.ide.plugins.PluginManager
+import com.intellij.lang.Language
+import com.intellij.openapi.extensions.PluginId
+
+
+enum class PluginIds(val pluginId: String) {
+    EXPLYT("com.explyt.test"),
+    HTTP_CLIENT_JB("com.jetbrains.restClient"),
+    SPRING_JB("com.intellij.spring"),
+    SPRING_DEBUGGER_JB("com.intellij.spring.debugger"),
+    CDI_JB("com.intellij.cdi"), //Jakarta EE - DI (QUARKUS SEXPLYT Conflict)
+    SPRING_BOOT_JB("com.intellij.spring.boot"),
+    ;
+
+    fun findEnabled() = PluginManager.getInstance().findEnabledPlugin(PluginId.getId(pluginId))
+
+    fun isEnabled() = findEnabled() != null
+
+    fun isNotEnabled() = !isEnabled()
+}
+
+enum class PluginSqlLanguage(val langId: String) {
+    SQL("SQL"),
+    JPAQL("JPAQL"),
+    HQL("HQL"),
+    SPRING_QL("SpringDataQL"),
+    ;
+
+    fun isEnabled() = Language.findLanguageByID(langId) != null
+}

modules/base/src/main/kotlin/com/explyt/util/ExplytPsiUtil.kt

@@ -28,9 +28,12 @@ import com.intellij.psi.*
 import com.intellij.psi.util.PropertyUtilBase
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.util.childrenOfType
+import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
 import org.jetbrains.kotlin.psi.KtNamedFunction
+import org.jetbrains.uast.UClass
 import org.jetbrains.uast.UMethod
+import org.jetbrains.uast.getParentOfType
 import org.jetbrains.uast.toUElement
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
@@ -285,8 +288,12 @@ object ExplytPsiUtil {
     fun PsiMember?.isRegistrar(): Boolean {
         val psiMethod = this as? PsiMethod ?: return false
         if (psiMethod.name == "register" && psiMethod.returnType?.canonicalText == "void") return true
-        return psiMethod.isPublic && (psiMethod.toString().contains("BeanRegistrarDsl")
-                || psiMethod.parent?.toString()?.contains("BeanRegistrarDsl") == true)
+        if (psiMethod.language != KotlinLanguage.INSTANCE) return false
+        if (psiMethod.isPublic && psiMethod.name.contains("regist", true)) {
+            val uClass = psiMethod.toUElement()?.getParentOfType<UClass>() ?: return false
+            return uClass.uastSuperTypes.any { it.getQualifiedName()?.contains("BeanRegistrarDsl", true) == true }
+        }
+        return false
     }
 
     fun navigate(psiElement: PsiElement?) {

modules/jpa/jpa.gradle.kts

@@ -71,8 +71,9 @@ val defaultIdeaVersion: String by rootProject
 dependencies {
     implementation(baseProject)
     intellijPlatform {
-        create(defaultIdeaType, defaultIdeaVersion, useInstaller = false)
-        jetbrainsRuntime()
+        intellijIdea(defaultIdeaVersion) {
+            useInstaller = false
+        }
         bundledPlugins(intellijPlugins)
         testFramework(TestFrameworkType.Platform)
         testFramework(TestFrameworkType.Plugin.Java)

modules/jpa/src/main/kotlin/com/explyt/jpa/langinjection/JpqNamedQueryLanguageInjector.kt

@@ -18,13 +18,17 @@
 package com.explyt.jpa.langinjection
 
 import com.explyt.jpa.JpaClasses
+import com.explyt.plugin.PluginSqlLanguage
 import org.jetbrains.uast.UAnnotation
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.getParentOfType
 import org.jetbrains.uast.isUastChildOf
 
 class JpqNamedQueryLanguageInjector : JpqlInjectorBase() {
     override fun isValidPlace(uElement: UElement): Boolean {
+        if (PluginSqlLanguage.JPAQL.isEnabled()) return false
+        if (PluginSqlLanguage.SPRING_QL.isEnabled()) return false
+
         val uAnnotation = uElement.getParentOfType<UAnnotation>() ?: return false
 
         if (!JpaClasses.namedQuery.check(uAnnotation.qualifiedName))

modules/jpa/src/main/kotlin/com/explyt/jpa/langinjection/JpqlEntityManagerLanguageInjector.kt

@@ -18,11 +18,14 @@
 package com.explyt.jpa.langinjection
 
 import com.explyt.jpa.JpaClasses
+import com.explyt.plugin.PluginSqlLanguage
 import com.intellij.psi.PsiMethod
 import org.jetbrains.uast.*
 
 class JpqlEntityManagerLanguageInjector : JpqlInjectorBase() {
     override fun isValidPlace(uElement: UElement): Boolean {
+        if (PluginSqlLanguage.JPAQL.isEnabled()) return false
+
         val uCallExpression = uElement.getParentOfType<UCallExpression>() ?: return false
 
         val firstParameter = uCallExpression.valueArguments.getOrNull(0) ?: return false

modules/jpa/src/main/kotlin/com/explyt/jpa/ql/JpqlFileType.kt

@@ -22,11 +22,11 @@ import com.intellij.openapi.fileTypes.LanguageFileType
 import javax.swing.Icon
 
 class JpqlFileType private constructor() : LanguageFileType(JpqlLanguage.INSTANCE) {
-    override fun getName(): String = "JPA QL"
+    override fun getName(): String = "JPA QL Explyt"
 
-    override fun getDescription(): String = "JPQL file"
+    override fun getDescription(): String = "JPQL file Explyt"
 
-    override fun getDefaultExtension(): String = "jpql"
+    override fun getDefaultExtension(): String = "ejpql"
 
     override fun getIcon(): Icon = AllIcons.FileTypes.Text