diff --git a/.idea/modules.xml b/.idea/modules.xml index e4fee1dcefac..178cd83e70bd 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -459,9 +459,12 @@ + + + diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt index 198b41377de5..17a75eec4446 100644 --- a/build/bazel-generated-file-list.txt +++ b/build/bazel-generated-file-list.txt @@ -997,7 +997,10 @@ plugins/gradle/gradle-declarative-sync plugins/gradle/gradle-dependency-updater plugins/gradle/intellij.gradle.analysis plugins/gradle/java +plugins/gradle/java/groovy +plugins/gradle/java/groovy/toml plugins/gradle/java/performance +plugins/gradle/java/toml plugins/gradle/jps-plugin plugins/gradle/kotlin/tests plugins/gradle/native diff --git a/plugins/gradle/java/BUILD.bazel b/plugins/gradle/java/BUILD.bazel index 325c52f1d619..9a3b0d27346a 100644 --- a/plugins/gradle/java/BUILD.bazel +++ b/plugins/gradle/java/BUILD.bazel @@ -174,6 +174,7 @@ jvm_library( "//platform/statistics/testFramework", "//platform/execution", "//platform/refactoring", + "//plugins/gradle/java/toml", ], runtime_deps = [":java-tests"] ) diff --git a/plugins/gradle/java/groovy/BUILD.bazel b/plugins/gradle/java/groovy/BUILD.bazel new file mode 100644 index 000000000000..50e06e28c387 --- /dev/null +++ b/plugins/gradle/java/groovy/BUILD.bazel @@ -0,0 +1,17 @@ +### auto-generated section `build intellij.gradle.java.groovy` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "groovy_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "groovy", + module_name = "intellij.gradle.java.groovy", + visibility = ["//visibility:public"], + srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), + resources = [":groovy_resources"] +) +### auto-generated section `build intellij.gradle.java.groovy` end \ No newline at end of file diff --git a/plugins/gradle/java/groovy/intellij.gradle.java.groovy.iml b/plugins/gradle/java/groovy/intellij.gradle.java.groovy.iml new file mode 100644 index 000000000000..ffc00f6a1337 --- /dev/null +++ b/plugins/gradle/java/groovy/intellij.gradle.java.groovy.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/gradle/java/groovy/resources/intellij.gradle.java.groovy.xml b/plugins/gradle/java/groovy/resources/intellij.gradle.java.groovy.xml new file mode 100644 index 000000000000..164f46cfcfb2 --- /dev/null +++ b/plugins/gradle/java/groovy/resources/intellij.gradle.java.groovy.xml @@ -0,0 +1,2 @@ + + diff --git a/plugins/gradle/java/groovy/src/.keep b/plugins/gradle/java/groovy/src/.keep new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/plugins/gradle/java/groovy/toml/BUILD.bazel b/plugins/gradle/java/groovy/toml/BUILD.bazel new file mode 100644 index 000000000000..aa0cd3202880 --- /dev/null +++ b/plugins/gradle/java/groovy/toml/BUILD.bazel @@ -0,0 +1,38 @@ +### auto-generated section `build intellij.gradle.java.groovy.toml` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "toml_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "toml", + module_name = "intellij.gradle.java.groovy.toml", + visibility = ["//visibility:public"], + srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), + resources = [":toml_resources"], + deps = [ + "@lib//:kotlin-stdlib", + "@lib//:jetbrains-annotations", + "//plugins/toml/core", + "//platform/util/multiplatform", + "//platform/analysis-api:analysis", + "//platform/core-api:core", + "//platform/core-impl", + "//platform/util", + "//platform/lang-impl", + "//platform/core-ui", + "//platform/editor-ui-api:editor-ui", + "//platform/indexing-api:indexing", + "//platform/usageView", + "//plugins/gradle/java", + "//java/java-psi-api:psi", + "//platform/refactoring", + "//plugins/groovy/groovy-psi:psi", + "//plugins/gradle/java/toml", + "//uast/uast-common:uast", + ] +) +### auto-generated section `build intellij.gradle.java.groovy.toml` end \ No newline at end of file diff --git a/plugins/gradle/java/groovy/toml/intellij.gradle.java.groovy.toml.iml b/plugins/gradle/java/groovy/toml/intellij.gradle.java.groovy.toml.iml new file mode 100644 index 000000000000..68da59594083 --- /dev/null +++ b/plugins/gradle/java/groovy/toml/intellij.gradle.java.groovy.toml.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/gradle/java/groovy/toml/resources/intellij.gradle.java.groovy.toml.xml b/plugins/gradle/java/groovy/toml/resources/intellij.gradle.java.groovy.toml.xml new file mode 100644 index 000000000000..d8f87d9ef195 --- /dev/null +++ b/plugins/gradle/java/groovy/toml/resources/intellij.gradle.java.groovy.toml.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/plugins/gradle/java/src/codeInspection/groovy/GroovyGradleDslInspectionProvider.kt b/plugins/gradle/java/groovy/toml/src/GroovyGradleDslInspectionProvider.kt similarity index 69% rename from plugins/gradle/java/src/codeInspection/groovy/GroovyGradleDslInspectionProvider.kt rename to plugins/gradle/java/groovy/toml/src/GroovyGradleDslInspectionProvider.kt index a418e24d0475..55e99164e41c 100644 --- a/plugins/gradle/java/src/codeInspection/groovy/GroovyGradleDslInspectionProvider.kt +++ b/plugins/gradle/java/groovy/toml/src/GroovyGradleDslInspectionProvider.kt @@ -1,11 +1,17 @@ -// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.plugins.gradle.codeInspection.groovy +// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.gradle.java.groovy.toml import com.intellij.codeInspection.ProblemsHolder import com.intellij.openapi.util.io.FileUtilRt import com.intellij.psi.PsiElementVisitor import com.intellij.psi.PsiFile import org.jetbrains.plugins.gradle.codeInspection.GradleDslInspectionProvider +import org.jetbrains.plugins.gradle.codeInspection.groovy.GroovyAvoidDependencyNamedArgumentsNotationInspectionVisitor +import org.jetbrains.plugins.gradle.codeInspection.groovy.GroovyConfigurationAvoidanceVisitor +import org.jetbrains.plugins.gradle.codeInspection.groovy.GroovyDeprecatedConfigurationInspectionVisitor +import org.jetbrains.plugins.gradle.codeInspection.groovy.GroovyForeignDelegateInspectionVisitor +import org.jetbrains.plugins.gradle.codeInspection.groovy.GroovyIncorrectDependencyNotationArgumentInspectionVisitor +import org.jetbrains.plugins.gradle.codeInspection.groovy.GroovyPluginDslStructureInspectionVisitor import org.jetbrains.plugins.gradle.util.GradleConstants import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementVisitor @@ -30,11 +36,11 @@ class GroovyGradleDslInspectionProvider : GradleDslInspectionProvider { FileUtilRt.extensionEquals(file.name, GradleConstants.EXTENSION) override fun getAvoidDependencyNamedArgumentsNotationInspectionVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor = - GroovyPsiElementVisitor(GroovyAvoidDependencyNamedArgumentsNotationInspectionVisitor(holder)) + GroovyPsiElementVisitor(GroovyAvoidDependencyNamedArgumentsNotationInspectionVisitor(holder)) override fun isRedundantKotlinStdLibInspectionAvailable(file: PsiFile): Boolean = FileUtilRt.extensionEquals(file.name, GradleConstants.EXTENSION) override fun getRedundantKotlinStdLibInspectionVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor = - GroovyPsiElementVisitor(GroovyRedundantKotlinStdLibInspectionVisitor(holder)) + GroovyPsiElementVisitor(GroovyRedundantKotlinStdLibInspectionVisitor(holder)) } \ No newline at end of file diff --git a/plugins/gradle/java/src/codeInspection/groovy/GroovyRedundantKotlinStdLibInspectionVisitor.kt b/plugins/gradle/java/groovy/toml/src/GroovyRedundantKotlinStdLibInspectionVisitor.kt similarity index 98% rename from plugins/gradle/java/src/codeInspection/groovy/GroovyRedundantKotlinStdLibInspectionVisitor.kt rename to plugins/gradle/java/groovy/toml/src/GroovyRedundantKotlinStdLibInspectionVisitor.kt index 42691fd54e73..3d7f3dd05ac7 100644 --- a/plugins/gradle/java/src/codeInspection/groovy/GroovyRedundantKotlinStdLibInspectionVisitor.kt +++ b/plugins/gradle/java/groovy/toml/src/GroovyRedundantKotlinStdLibInspectionVisitor.kt @@ -1,10 +1,12 @@ // Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.plugins.gradle.codeInspection.groovy +package com.intellij.gradle.java.groovy.toml import com.intellij.codeInspection.CommonQuickFixBundle import com.intellij.codeInspection.ProblemsHolder import com.intellij.codeInspection.util.IntentionFamilyName import com.intellij.codeInspection.util.IntentionName +import com.intellij.gradle.java.toml.getResolvedDependency +import com.intellij.gradle.java.toml.getResolvedPlugin import com.intellij.modcommand.ModPsiUpdater import com.intellij.modcommand.PsiUpdateModCommandQuickFix import com.intellij.openapi.diagnostic.debug @@ -16,8 +18,6 @@ import com.intellij.psi.util.childrenOfType import org.jetbrains.plugins.gradle.codeInspection.GradleInspectionBundle import org.jetbrains.plugins.gradle.service.resolve.GradleCommonClassNames.GRADLE_API_DEPENDENCY_HANDLER import org.jetbrains.plugins.gradle.service.resolve.GradleDependencyHandlerContributor.Companion.dependencyMethodKind -import org.jetbrains.plugins.gradle.toml.getResolvedDependency -import org.jetbrains.plugins.gradle.toml.getResolvedPlugin import org.jetbrains.plugins.groovy.lang.psi.GrReferenceElement import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor import org.jetbrains.plugins.groovy.lang.psi.GroovyFile diff --git a/plugins/gradle/java/src/service/toml/GradleGroovyVersionCatalogReferencesSearcher.kt b/plugins/gradle/java/groovy/toml/src/service/GradleGroovyVersionCatalogReferencesSearcher.kt similarity index 96% rename from plugins/gradle/java/src/service/toml/GradleGroovyVersionCatalogReferencesSearcher.kt rename to plugins/gradle/java/groovy/toml/src/service/GradleGroovyVersionCatalogReferencesSearcher.kt index 4be5539d8956..27330ad39f15 100644 --- a/plugins/gradle/java/src/service/toml/GradleGroovyVersionCatalogReferencesSearcher.kt +++ b/plugins/gradle/java/groovy/toml/src/service/GradleGroovyVersionCatalogReferencesSearcher.kt @@ -1,6 +1,7 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.plugins.gradle.service.toml +// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.gradle.java.groovy.toml.service +import com.intellij.gradle.java.toml.getVersionCatalogParts import com.intellij.lang.java.beans.PropertyKind import com.intellij.openapi.application.QueryExecutorBase import com.intellij.openapi.application.runReadAction @@ -14,7 +15,6 @@ import com.intellij.psi.util.PropertyUtilBase import com.intellij.psi.util.parentOfType import com.intellij.util.Processor import com.intellij.util.asSafely -import org.jetbrains.plugins.gradle.toml.getVersionCatalogParts import org.jetbrains.plugins.groovy.findUsages.GroovyScopeUtil import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementFactory import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrMethodCall diff --git a/plugins/gradle/java/src/service/toml/GradleVersionCatalogTomlAwareGotoDeclarationHandler.kt b/plugins/gradle/java/groovy/toml/src/service/GradleVersionCatalogTomlAwareGotoDeclarationHandler.kt similarity index 89% rename from plugins/gradle/java/src/service/toml/GradleVersionCatalogTomlAwareGotoDeclarationHandler.kt rename to plugins/gradle/java/groovy/toml/src/service/GradleVersionCatalogTomlAwareGotoDeclarationHandler.kt index dea1677a9ee3..680ce19bec06 100644 --- a/plugins/gradle/java/src/service/toml/GradleVersionCatalogTomlAwareGotoDeclarationHandler.kt +++ b/plugins/gradle/java/groovy/toml/src/service/GradleVersionCatalogTomlAwareGotoDeclarationHandler.kt @@ -1,7 +1,9 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.plugins.gradle.service.toml +// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.gradle.java.groovy.toml.service import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler +import com.intellij.gradle.java.toml.findOriginInTomlFile +import com.intellij.gradle.java.toml.findTomlFile import com.intellij.openapi.editor.Editor import com.intellij.openapi.util.registry.Registry import com.intellij.psi.PsiElement @@ -9,8 +11,6 @@ import com.intellij.psi.PsiMethod import com.intellij.psi.util.parentOfType import com.intellij.psi.util.parents import org.jetbrains.plugins.gradle.service.project.CommonGradleProjectResolverExtension -import org.jetbrains.plugins.gradle.toml.findOriginInTomlFile -import org.jetbrains.plugins.gradle.toml.findTomlFile import org.jetbrains.plugins.gradle.util.isInVersionCatalogAccessor import org.jetbrains.plugins.groovy.lang.psi.GrReferenceElement import org.jetbrains.plugins.groovy.lang.resolve.api.GroovyPropertyBase diff --git a/plugins/gradle/java/intellij.gradle.java.tests.iml b/plugins/gradle/java/intellij.gradle.java.tests.iml index 470310dcd721..77ffa29783b1 100644 --- a/plugins/gradle/java/intellij.gradle.java.tests.iml +++ b/plugins/gradle/java/intellij.gradle.java.tests.iml @@ -65,5 +65,6 @@ + \ No newline at end of file diff --git a/plugins/gradle/java/resources/META-INF/gradle-groovy-integration.xml b/plugins/gradle/java/resources/META-INF/gradle-groovy-integration.xml index 9673836cfff5..4b54fcdaae2f 100644 --- a/plugins/gradle/java/resources/META-INF/gradle-groovy-integration.xml +++ b/plugins/gradle/java/resources/META-INF/gradle-groovy-integration.xml @@ -1,6 +1,5 @@ com.intellij.completion.ml.ranking - org.toml.lang - diff --git a/plugins/gradle/java/resources/META-INF/gradle-groovy-toml-integration.xml b/plugins/gradle/java/resources/META-INF/gradle-groovy-toml-integration.xml deleted file mode 100644 index 1e1927c489d2..000000000000 --- a/plugins/gradle/java/resources/META-INF/gradle-groovy-toml-integration.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/plugins/gradle/java/resources/META-INF/gradle-toml-integration.xml b/plugins/gradle/java/resources/META-INF/gradle-toml-integration.xml deleted file mode 100644 index d25a2185d4c4..000000000000 --- a/plugins/gradle/java/resources/META-INF/gradle-toml-integration.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/plugins/gradle/java/resources/META-INF/plugin.xml b/plugins/gradle/java/resources/META-INF/plugin.xml index 8f1522aafc05..d9b2dc22edcb 100644 --- a/plugins/gradle/java/resources/META-INF/plugin.xml +++ b/plugins/gradle/java/resources/META-INF/plugin.xml @@ -21,7 +21,6 @@ Coverage org.intellij.groovy com.intellij.properties - org.toml.lang @@ -29,6 +28,9 @@ + + + messages.GradleInspectionBundle diff --git a/plugins/gradle/java/src/util/versionCatalogs.kt b/plugins/gradle/java/src/util/versionCatalogs.kt index 6d25cac223cd..cb1a84a23838 100644 --- a/plugins/gradle/java/src/util/versionCatalogs.kt +++ b/plugins/gradle/java/src/util/versionCatalogs.kt @@ -1,12 +1,15 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +@file:ApiStatus.Internal package org.jetbrains.plugins.gradle.util import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.PsiClass import com.intellij.psi.PsiMethod import com.intellij.psi.util.PropertyUtilBase +import org.jetbrains.annotations.ApiStatus -internal fun getCapitalizedAccessorName(method: PsiMethod): String? { +fun getCapitalizedAccessorName(method: PsiMethod): String? { val propertyName = PropertyUtilBase.getPropertyName(method) ?: return null val methodFinalPart = StringUtil.capitalize(propertyName) val methodParts = method.containingClass?.takeUnless { it.name?.startsWith(LIBRARIES_FOR_PREFIX) == true }?.name?.trimAccessorName() @@ -37,10 +40,10 @@ private fun getTopContainingClass(psiMethod: PsiMethod?): PsiClass? { return topClass } -internal const val BUNDLE_ACCESSORS_SUFFIX = "BundleAccessors" -internal const val LIBRARY_ACCESSORS_SUFFIX = "LibraryAccessors" -internal const val PLUGIN_ACCESSORS_SUFFIX = "PluginAccessors" -internal const val VERSION_ACCESSORS_SUFFIX = "VersionAccessors" +const val BUNDLE_ACCESSORS_SUFFIX: String = "BundleAccessors" +const val LIBRARY_ACCESSORS_SUFFIX: String = "LibraryAccessors" +const val PLUGIN_ACCESSORS_SUFFIX: String = "PluginAccessors" +const val VERSION_ACCESSORS_SUFFIX: String = "VersionAccessors" -internal const val LIBRARIES_FOR_PREFIX = "LibrariesFor" +const val LIBRARIES_FOR_PREFIX: String = "LibrariesFor" diff --git a/plugins/gradle/java/testSources/toml/GradleFindTomlCatalogKeyTest.kt b/plugins/gradle/java/testSources/toml/GradleFindTomlCatalogKeyTest.kt index ff42991ed4da..263e45327103 100644 --- a/plugins/gradle/java/testSources/toml/GradleFindTomlCatalogKeyTest.kt +++ b/plugins/gradle/java/testSources/toml/GradleFindTomlCatalogKeyTest.kt @@ -15,6 +15,7 @@ */ package org.jetbrains.plugins.gradle.toml +import com.intellij.gradle.java.toml.findTomlCatalogKey import com.intellij.openapi.externalSystem.util.runReadAction import com.intellij.psi.PsiElement import com.intellij.psi.PsiFileFactory diff --git a/plugins/gradle/java/toml/BUILD.bazel b/plugins/gradle/java/toml/BUILD.bazel new file mode 100644 index 000000000000..1f28ee3e0f20 --- /dev/null +++ b/plugins/gradle/java/toml/BUILD.bazel @@ -0,0 +1,36 @@ +### auto-generated section `build intellij.gradle.java.toml` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "toml_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "toml", + module_name = "intellij.gradle.java.toml", + visibility = ["//visibility:public"], + srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), + resources = [":toml_resources"], + deps = [ + "@lib//:kotlin-stdlib", + "@lib//:jetbrains-annotations", + "//plugins/toml/core", + "//platform/util/multiplatform", + "//platform/analysis-api:analysis", + "//platform/core-api:core", + "//platform/core-impl", + "//platform/util", + "//platform/lang-impl", + "//platform/core-ui", + "//platform/editor-ui-api:editor-ui", + "//platform/indexing-api:indexing", + "//platform/usageView", + "//plugins/gradle/java", + "//java/java-psi-api:psi", + "//platform/refactoring", + "//platform/projectModel-api:projectModel", + ] +) +### auto-generated section `build intellij.gradle.java.toml` end \ No newline at end of file diff --git a/plugins/gradle/java/toml/intellij.gradle.java.toml.iml b/plugins/gradle/java/toml/intellij.gradle.java.toml.iml new file mode 100644 index 000000000000..a8a6285622b6 --- /dev/null +++ b/plugins/gradle/java/toml/intellij.gradle.java.toml.iml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/gradle/java/toml/resources/intellij.gradle.java.toml.xml b/plugins/gradle/java/toml/resources/intellij.gradle.java.toml.xml new file mode 100644 index 000000000000..faf2b536df38 --- /dev/null +++ b/plugins/gradle/java/toml/resources/intellij.gradle.java.toml.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/gradle/java/src/toml/completion/TomlVersionCatalogCompletionContributor.kt b/plugins/gradle/java/toml/src/completion/TomlVersionCatalogCompletionContributor.kt similarity index 99% rename from plugins/gradle/java/src/toml/completion/TomlVersionCatalogCompletionContributor.kt rename to plugins/gradle/java/toml/src/completion/TomlVersionCatalogCompletionContributor.kt index dffaa2d1d692..db20f059e750 100644 --- a/plugins/gradle/java/src/toml/completion/TomlVersionCatalogCompletionContributor.kt +++ b/plugins/gradle/java/toml/src/completion/TomlVersionCatalogCompletionContributor.kt @@ -1,5 +1,5 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.plugins.gradle.toml.completion +package com.intellij.gradle.java.toml.completion import com.intellij.codeInsight.completion.CompletionConfidence import com.intellij.codeInsight.completion.CompletionContributor diff --git a/plugins/gradle/java/src/toml/findUsages/GradleVersionCatalogFindUsagesFactory.kt b/plugins/gradle/java/toml/src/findUsages/GradleVersionCatalogFindUsagesFactory.kt similarity index 93% rename from plugins/gradle/java/src/toml/findUsages/GradleVersionCatalogFindUsagesFactory.kt rename to plugins/gradle/java/toml/src/findUsages/GradleVersionCatalogFindUsagesFactory.kt index e3d6b381a55c..af7d25afc223 100644 --- a/plugins/gradle/java/src/toml/findUsages/GradleVersionCatalogFindUsagesFactory.kt +++ b/plugins/gradle/java/toml/src/findUsages/GradleVersionCatalogFindUsagesFactory.kt @@ -1,5 +1,5 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.plugins.gradle.toml.findUsages +package com.intellij.gradle.java.toml.findUsages import com.intellij.find.findUsages.FindUsagesHandler import com.intellij.find.findUsages.FindUsagesHandlerFactory diff --git a/plugins/gradle/java/src/toml/findUsages/GradleVersionCatalogFindUsagesHandler.kt b/plugins/gradle/java/toml/src/findUsages/GradleVersionCatalogFindUsagesHandler.kt similarity index 97% rename from plugins/gradle/java/src/toml/findUsages/GradleVersionCatalogFindUsagesHandler.kt rename to plugins/gradle/java/toml/src/findUsages/GradleVersionCatalogFindUsagesHandler.kt index 93b592b1b35c..cd5e3a315103 100644 --- a/plugins/gradle/java/src/toml/findUsages/GradleVersionCatalogFindUsagesHandler.kt +++ b/plugins/gradle/java/toml/src/findUsages/GradleVersionCatalogFindUsagesHandler.kt @@ -1,5 +1,5 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.plugins.gradle.toml.findUsages +package com.intellij.gradle.java.toml.findUsages import com.intellij.find.findUsages.FindUsagesHandler import com.intellij.find.findUsages.FindUsagesOptions diff --git a/plugins/gradle/java/src/toml/navigation/VersionCatalogDescriptionProvider.kt b/plugins/gradle/java/toml/src/navigation/VersionCatalogDescriptionProvider.kt similarity index 96% rename from plugins/gradle/java/src/toml/navigation/VersionCatalogDescriptionProvider.kt rename to plugins/gradle/java/toml/src/navigation/VersionCatalogDescriptionProvider.kt index f786e61162de..b6fcc89e2162 100644 --- a/plugins/gradle/java/src/toml/navigation/VersionCatalogDescriptionProvider.kt +++ b/plugins/gradle/java/toml/src/navigation/VersionCatalogDescriptionProvider.kt @@ -1,5 +1,5 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.plugins.gradle.toml.navigation +package com.intellij.gradle.java.toml.navigation import com.intellij.psi.ElementDescriptionLocation import com.intellij.psi.ElementDescriptionProvider diff --git a/plugins/gradle/java/src/toml/navigation/VersionCatalogReferenceContributor.kt b/plugins/gradle/java/toml/src/navigation/VersionCatalogReferenceContributor.kt similarity index 96% rename from plugins/gradle/java/src/toml/navigation/VersionCatalogReferenceContributor.kt rename to plugins/gradle/java/toml/src/navigation/VersionCatalogReferenceContributor.kt index d6485501d5c2..692ed1eb7caf 100644 --- a/plugins/gradle/java/src/toml/navigation/VersionCatalogReferenceContributor.kt +++ b/plugins/gradle/java/toml/src/navigation/VersionCatalogReferenceContributor.kt @@ -1,5 +1,5 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.plugins.gradle.toml.navigation +package com.intellij.gradle.java.toml.navigation import com.intellij.openapi.util.text.StringUtil import com.intellij.patterns.ElementPattern @@ -14,8 +14,8 @@ import com.intellij.psi.PsiReferenceProvider import com.intellij.psi.PsiReferenceRegistrar import com.intellij.util.ProcessingContext import com.intellij.util.asSafely -import org.jetbrains.plugins.gradle.toml.getLibraries -import org.jetbrains.plugins.gradle.toml.getVersions +import com.intellij.gradle.java.toml.getLibraries +import com.intellij.gradle.java.toml.getVersions import org.toml.lang.psi.TomlArray import org.toml.lang.psi.TomlInlineTable import org.toml.lang.psi.TomlKeySegment diff --git a/plugins/gradle/java/src/toml/navigation/VersionCatalogRenameInputValidator.kt b/plugins/gradle/java/toml/src/navigation/VersionCatalogRenameInputValidator.kt similarity index 95% rename from plugins/gradle/java/src/toml/navigation/VersionCatalogRenameInputValidator.kt rename to plugins/gradle/java/toml/src/navigation/VersionCatalogRenameInputValidator.kt index 88021fd36cc6..5777bd1cc042 100644 --- a/plugins/gradle/java/src/toml/navigation/VersionCatalogRenameInputValidator.kt +++ b/plugins/gradle/java/toml/src/navigation/VersionCatalogRenameInputValidator.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.plugins.gradle.toml.navigation +package com.intellij.gradle.java.toml.navigation import com.intellij.patterns.ElementPattern import com.intellij.patterns.PatternCondition diff --git a/plugins/gradle/java/src/service/toml/GradleTomlUseScopeEnlarger.kt b/plugins/gradle/java/toml/src/service/GradleTomlUseScopeEnlarger.kt similarity index 94% rename from plugins/gradle/java/src/service/toml/GradleTomlUseScopeEnlarger.kt rename to plugins/gradle/java/toml/src/service/GradleTomlUseScopeEnlarger.kt index b48886834dfc..91e226fc00ca 100644 --- a/plugins/gradle/java/src/service/toml/GradleTomlUseScopeEnlarger.kt +++ b/plugins/gradle/java/toml/src/service/GradleTomlUseScopeEnlarger.kt @@ -1,5 +1,5 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.plugins.gradle.service.toml +package com.intellij.gradle.java.toml.service import com.intellij.psi.PsiElement import com.intellij.psi.search.SearchScope diff --git a/plugins/gradle/java/src/toml/util.kt b/plugins/gradle/java/toml/src/util.kt similarity index 97% rename from plugins/gradle/java/src/toml/util.kt rename to plugins/gradle/java/toml/src/util.kt index 1520e1a95ca4..e7b3d4c18390 100644 --- a/plugins/gradle/java/src/toml/util.kt +++ b/plugins/gradle/java/toml/src/util.kt @@ -1,5 +1,6 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.plugins.gradle.toml +// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +@file:ApiStatus.Internal +package com.intellij.gradle.java.toml import com.intellij.openapi.components.service import com.intellij.openapi.module.ModuleUtilCore @@ -16,6 +17,7 @@ import com.intellij.psi.util.InheritanceUtil import com.intellij.psi.util.childrenOfType import com.intellij.util.asSafely import com.intellij.util.containers.tail +import org.jetbrains.annotations.ApiStatus import org.jetbrains.plugins.gradle.service.resolve.GradleCommonClassNames.GRADLE_API_PROVIDER_PROVIDER import org.jetbrains.plugins.gradle.service.resolve.GradleCommonClassNames.GRADLE_API_PROVIDER_PROVIDER_CONVERTIBLE import org.jetbrains.plugins.gradle.service.resolve.VersionCatalogsLocator @@ -48,7 +50,7 @@ internal fun getVersions(context: PsiElement): List = getTableEn internal fun getLibraries(context: PsiElement): List = getTableEntries(context, "libraries") -internal fun String.getVersionCatalogParts() : List = split("_", "-") +fun String.getVersionCatalogParts() : List = split("_", "-") fun findTomlFile(context: PsiElement, name: String): TomlFile? { val module = ModuleUtilCore.findModuleForPsiElement(context) ?: return null @@ -65,7 +67,7 @@ private fun findTomlFileDynamically(context: PsiElement, name: String): VirtualF } /** - * Given a [TomlFile] and a path, returns the corresponding key element. + * Given a [org.toml.lang.psi.TomlFile] and a path, returns the corresponding key element. * For example, given "versions.foo", it will locate the `foo =` key/value * pair under the `\[versions]` table and return it. As a special case, * `libraries` don't have to be explicitly named in the path. diff --git a/plugins/kotlin/gradle/code-insight-toml/BUILD.bazel b/plugins/kotlin/gradle/code-insight-toml/BUILD.bazel index 918dc1ef6468..8b4fc8f1e36e 100644 --- a/plugins/kotlin/gradle/code-insight-toml/BUILD.bazel +++ b/plugins/kotlin/gradle/code-insight-toml/BUILD.bazel @@ -28,6 +28,7 @@ jvm_library( "//platform/indexing-api:indexing", "//plugins/gradle/java", "//plugins/toml", + "//plugins/gradle/java/toml", ] ) ### auto-generated section `build intellij.kotlin.gradle.codeInsight.toml` end \ No newline at end of file diff --git a/plugins/kotlin/gradle/code-insight-toml/intellij.kotlin.gradle.codeInsight.toml.iml b/plugins/kotlin/gradle/code-insight-toml/intellij.kotlin.gradle.codeInsight.toml.iml index 6aa9291b1e83..b109a754dc57 100644 --- a/plugins/kotlin/gradle/code-insight-toml/intellij.kotlin.gradle.codeInsight.toml.iml +++ b/plugins/kotlin/gradle/code-insight-toml/intellij.kotlin.gradle.codeInsight.toml.iml @@ -22,5 +22,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/gradle/code-insight-toml/k2/BUILD.bazel b/plugins/kotlin/gradle/code-insight-toml/k2/BUILD.bazel index a69eff5af006..f2e73110c9a7 100644 --- a/plugins/kotlin/gradle/code-insight-toml/k2/BUILD.bazel +++ b/plugins/kotlin/gradle/code-insight-toml/k2/BUILD.bazel @@ -24,6 +24,7 @@ jvm_library( "//platform/core-impl", "//platform/util", "//java/java-psi-impl:psi-impl", + "//plugins/gradle/java/toml", ] ) ### auto-generated section `build intellij.kotlin.gradle.codeInsight.toml.k2` end \ No newline at end of file diff --git a/plugins/kotlin/gradle/code-insight-toml/k2/intellij.kotlin.gradle.codeInsight.toml.k2.iml b/plugins/kotlin/gradle/code-insight-toml/k2/intellij.kotlin.gradle.codeInsight.toml.k2.iml index dee66ab26860..4589a41b5ec9 100644 --- a/plugins/kotlin/gradle/code-insight-toml/k2/intellij.kotlin.gradle.codeInsight.toml.k2.iml +++ b/plugins/kotlin/gradle/code-insight-toml/k2/intellij.kotlin.gradle.codeInsight.toml.k2.iml @@ -18,5 +18,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/gradle/code-insight-toml/k2/src/org/jetbrains/kotlin/idea/gradle/versionCatalog/toml/k2/K2GradleTomlVersionCatalogPsiReferenceProviderContributor.kt b/plugins/kotlin/gradle/code-insight-toml/k2/src/org/jetbrains/kotlin/idea/gradle/versionCatalog/toml/k2/K2GradleTomlVersionCatalogPsiReferenceProviderContributor.kt index e4edff62c221..a37d83ef8825 100644 --- a/plugins/kotlin/gradle/code-insight-toml/k2/src/org/jetbrains/kotlin/idea/gradle/versionCatalog/toml/k2/K2GradleTomlVersionCatalogPsiReferenceProviderContributor.kt +++ b/plugins/kotlin/gradle/code-insight-toml/k2/src/org/jetbrains/kotlin/idea/gradle/versionCatalog/toml/k2/K2GradleTomlVersionCatalogPsiReferenceProviderContributor.kt @@ -1,12 +1,12 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.gradle.versionCatalog.toml.k2 +import com.intellij.gradle.java.toml.findTomlFile import org.jetbrains.kotlin.idea.gradle.versionCatalog.toml.KtTomlVersionCatalogReference import org.jetbrains.kotlin.idea.gradle.versionCatalog.toml.matchesTopmostCatalogReferencePattern import org.jetbrains.kotlin.psi.KtDotQualifiedExpression import org.jetbrains.kotlin.references.KotlinPsiReferenceProviderContributor import org.jetbrains.kotlin.references.KotlinPsiReferenceProviderContributor.ReferenceProvider -import org.jetbrains.plugins.gradle.toml.findTomlFile internal class K2GradleTomlVersionCatalogPsiReferenceProviderContributor : KotlinPsiReferenceProviderContributor { override val elementClass: Class diff --git a/plugins/kotlin/gradle/code-insight-toml/src/org/jetbrains/kotlin/idea/gradle/versionCatalog/toml/KotlinGradleTomlVersionCatalogGotoDeclarationHandler.kt b/plugins/kotlin/gradle/code-insight-toml/src/org/jetbrains/kotlin/idea/gradle/versionCatalog/toml/KotlinGradleTomlVersionCatalogGotoDeclarationHandler.kt index bd5f7eed29f1..12d564c5698b 100644 --- a/plugins/kotlin/gradle/code-insight-toml/src/org/jetbrains/kotlin/idea/gradle/versionCatalog/toml/KotlinGradleTomlVersionCatalogGotoDeclarationHandler.kt +++ b/plugins/kotlin/gradle/code-insight-toml/src/org/jetbrains/kotlin/idea/gradle/versionCatalog/toml/KotlinGradleTomlVersionCatalogGotoDeclarationHandler.kt @@ -4,6 +4,7 @@ package org.jetbrains.kotlin.idea.gradle.versionCatalog.toml import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler +import com.intellij.gradle.java.toml.findOriginInTomlFile import com.intellij.openapi.editor.Editor import com.intellij.openapi.util.registry.Registry import com.intellij.psi.PsiElement @@ -12,7 +13,6 @@ import org.jetbrains.kotlin.psi.KtDotQualifiedExpression import org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction import org.jetbrains.kotlin.utils.addToStdlib.safeAs import org.jetbrains.plugins.gradle.service.project.CommonGradleProjectResolverExtension.GRADLE_VERSION_CATALOGS_DYNAMIC_SUPPORT -import org.jetbrains.plugins.gradle.toml.findOriginInTomlFile import org.jetbrains.plugins.gradle.util.isInVersionCatalogAccessor import org.jetbrains.uast.toUElement import org.jetbrains.uast.tryResolve diff --git a/plugins/kotlin/gradle/code-insight-toml/src/org/jetbrains/kotlin/idea/gradle/versionCatalog/toml/KotlinGradleTomlVersionCatalogReferencesSearcher.kt b/plugins/kotlin/gradle/code-insight-toml/src/org/jetbrains/kotlin/idea/gradle/versionCatalog/toml/KotlinGradleTomlVersionCatalogReferencesSearcher.kt index 884c1922c6bd..b60cfdba426e 100644 --- a/plugins/kotlin/gradle/code-insight-toml/src/org/jetbrains/kotlin/idea/gradle/versionCatalog/toml/KotlinGradleTomlVersionCatalogReferencesSearcher.kt +++ b/plugins/kotlin/gradle/code-insight-toml/src/org/jetbrains/kotlin/idea/gradle/versionCatalog/toml/KotlinGradleTomlVersionCatalogReferencesSearcher.kt @@ -1,6 +1,7 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.gradle.versionCatalog.toml +import com.intellij.gradle.java.toml.getTomlParentSectionName import com.intellij.openapi.application.QueryExecutorBase import com.intellij.openapi.application.runReadAction import com.intellij.psi.PsiElement @@ -15,7 +16,6 @@ import com.intellij.util.Processor import org.jetbrains.kotlin.idea.base.util.restrictToKotlinSources import org.jetbrains.kotlin.psi.KtDotQualifiedExpression import org.jetbrains.kotlin.psi.KtPsiFactory -import org.jetbrains.plugins.gradle.toml.getTomlParentSectionName import org.toml.lang.psi.TomlKeySegment import org.toml.lang.psi.TomlKeyValue diff --git a/plugins/kotlin/gradle/code-insight-toml/src/org/jetbrains/kotlin/idea/gradle/versionCatalog/toml/KtTomlVersionCatalogReference.kt b/plugins/kotlin/gradle/code-insight-toml/src/org/jetbrains/kotlin/idea/gradle/versionCatalog/toml/KtTomlVersionCatalogReference.kt index 908a51e3ad93..5226b6a42bc8 100644 --- a/plugins/kotlin/gradle/code-insight-toml/src/org/jetbrains/kotlin/idea/gradle/versionCatalog/toml/KtTomlVersionCatalogReference.kt +++ b/plugins/kotlin/gradle/code-insight-toml/src/org/jetbrains/kotlin/idea/gradle/versionCatalog/toml/KtTomlVersionCatalogReference.kt @@ -1,10 +1,10 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.gradle.versionCatalog.toml +import com.intellij.gradle.java.toml.findTomlCatalogKey import com.intellij.psi.PsiElement import com.intellij.psi.PsiReferenceBase import org.jetbrains.kotlin.psi.KtDotQualifiedExpression -import org.jetbrains.plugins.gradle.toml.findTomlCatalogKey import org.toml.lang.psi.TomlFile class KtTomlVersionCatalogReference( diff --git a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/BUILD.bazel b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/BUILD.bazel index d5db9a5f92d4..759d4cfb5d56 100644 --- a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/BUILD.bazel +++ b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/BUILD.bazel @@ -80,6 +80,7 @@ jvm_library( "//plugins/gradle/java", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared", "//plugins/kotlin/uast/uast-kotlin-base:kotlin-uast-base", + "//plugins/gradle/java/toml", ] ) @@ -167,6 +168,7 @@ jvm_library( "//plugins/kotlin/uast/uast-kotlin-base:kotlin-uast-base", "//plugins/gradle/completion", "//plugins/gradle/completion:completion_test_lib", + "//plugins/gradle/java/toml", ] ) ### auto-generated section `build intellij.kotlin.gradle.scripting` end diff --git a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/intellij.kotlin.gradle.scripting.iml b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/intellij.kotlin.gradle.scripting.iml index 83dfbd530e46..9d43140ec219 100644 --- a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/intellij.kotlin.gradle.scripting.iml +++ b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/intellij.kotlin.gradle.scripting.iml @@ -92,5 +92,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/src/org/jetbrains/kotlin/gradle/scripting/k2/inspections/RedundantKotlinStdLibInspectionVisitor.kt b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/src/org/jetbrains/kotlin/gradle/scripting/k2/inspections/RedundantKotlinStdLibInspectionVisitor.kt index f09549ca1503..9698048088f6 100644 --- a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/src/org/jetbrains/kotlin/gradle/scripting/k2/inspections/RedundantKotlinStdLibInspectionVisitor.kt +++ b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/src/org/jetbrains/kotlin/gradle/scripting/k2/inspections/RedundantKotlinStdLibInspectionVisitor.kt @@ -5,6 +5,8 @@ import com.intellij.codeInspection.CommonQuickFixBundle import com.intellij.codeInspection.ProblemsHolder import com.intellij.codeInspection.util.IntentionFamilyName import com.intellij.codeInspection.util.IntentionName +import com.intellij.gradle.java.toml.getResolvedDependency +import com.intellij.gradle.java.toml.getResolvedPlugin import com.intellij.modcommand.ModPsiUpdater import com.intellij.openapi.project.Project import com.intellij.psi.PsiMethod @@ -21,8 +23,6 @@ import org.jetbrains.kotlin.psi.KtValueArgumentList import org.jetbrains.kotlin.psi.KtVisitorVoid import org.jetbrains.kotlin.utils.PathUtil.KOTLIN_JAVA_STDLIB_NAME import org.jetbrains.plugins.gradle.codeInspection.GradleInspectionBundle -import org.jetbrains.plugins.gradle.toml.getResolvedDependency -import org.jetbrains.plugins.gradle.toml.getResolvedPlugin import org.jetbrains.uast.UExpression import org.jetbrains.uast.toUElementOfType