From 8174dece93eef5ed4c46c5e9b80778c73d9a52a4 Mon Sep 17 00:00:00 2001 From: Alexander Bubenchikov Date: Sun, 11 Apr 2021 19:55:10 +0300 Subject: [PATCH] make PKGS classes open GitOrigin-RevId: f8183b237261fe4f77d6f66ba2e83405c5574ce1 --- .../AbstractProjectModuleOperationProvider.kt | 2 +- .../plugin/extensibility/BuildSystemType.kt | 18 ++++++++++++++---- .../DependencyOperationMetadata.kt | 2 +- .../ModuleChangesSignalProvider.kt | 4 ++-- .../plugin/extensibility/ProjectModule.kt | 3 ++- .../ProjectModuleOperationProvider.kt | 10 +++++----- .../extensibility/ProjectModuleProvider.kt | 2 +- .../plugin/extensibility/ProjectModuleType.kt | 5 +---- .../extensibility/RepositoryDeclaration.kt | 2 +- .../RepositoryOperationMetadata.kt | 2 +- .../plugin/extensibility/package-info.java | 4 ++++ .../gradle/GradleProjectModuleProvider.kt | 6 +++--- .../gradle/GradleProjectModuleType.kt | 4 ---- .../maven/MavenProjectModuleProvider.kt | 4 ++-- .../extensions/maven/MavenProjectModuleType.kt | 5 ----- .../ui/toolwindow/models/PackageVersion.kt | 4 ++-- 16 files changed, 40 insertions(+), 37 deletions(-) create mode 100644 plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/package-info.java diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/AbstractProjectModuleOperationProvider.kt b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/AbstractProjectModuleOperationProvider.kt index 4c52e35658a2..43d34e874179 100644 --- a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/AbstractProjectModuleOperationProvider.kt +++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/AbstractProjectModuleOperationProvider.kt @@ -11,7 +11,7 @@ import com.intellij.openapi.module.ModuleUtilCore import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile -internal abstract class AbstractProjectModuleOperationProvider : ProjectModuleOperationProvider { +abstract class AbstractProjectModuleOperationProvider : ProjectModuleOperationProvider { override fun addDependencyToProject( operationMetadata: DependencyOperationMetadata, diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/BuildSystemType.kt b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/BuildSystemType.kt index 0c787fc92e61..d8eed1e9582a 100644 --- a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/BuildSystemType.kt +++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/BuildSystemType.kt @@ -1,7 +1,17 @@ package com.jetbrains.packagesearch.intellij.plugin.extensibility -internal enum class BuildSystemType(val statisticsKey: String) { - MAVEN(statisticsKey = "maven"), - GRADLE_GROOVY(statisticsKey = "gradle-groovy"), - GRADLE_KOTLIN(statisticsKey = "gradle-kts") +class BuildSystemType(val name: String, val statisticsKey: String) { + companion object { + + @JvmStatic + val MAVEN = BuildSystemType(name = "MAVEN", statisticsKey = "maven") + + @JvmStatic + val GRADLE_GROOVY = BuildSystemType(name = "GRADLE_GROOVY", statisticsKey = "gradle-groovy") + + @JvmStatic + val GRADLE_KOTLIN = BuildSystemType(name = "GRADLE_KOTLIN", statisticsKey = "gradle-kts") + } } + +class Build diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/DependencyOperationMetadata.kt b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/DependencyOperationMetadata.kt index 9eb94946ddf6..391e991551e2 100644 --- a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/DependencyOperationMetadata.kt +++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/DependencyOperationMetadata.kt @@ -1,6 +1,6 @@ package com.jetbrains.packagesearch.intellij.plugin.extensibility -internal data class DependencyOperationMetadata( +data class DependencyOperationMetadata( val module: ProjectModule, val groupId: String, val artifactId: String, diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ModuleChangesSignalProvider.kt b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ModuleChangesSignalProvider.kt index f3280780a704..71ea90005915 100644 --- a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ModuleChangesSignalProvider.kt +++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ModuleChangesSignalProvider.kt @@ -11,7 +11,7 @@ import com.jetbrains.rd.util.reactive.Signal import com.jetbrains.rd.util.reactive.flowInto import kotlin.streams.asSequence -internal interface ModuleChangesSignalProvider { +interface ModuleChangesSignalProvider { companion object { @@ -34,4 +34,4 @@ internal interface ModuleChangesSignalProvider { fun listenToModuleChanges(project: Project, lifetime: Lifetime): IVoidSource } -internal fun MessageBus.connect(lifetime: Lifetime): MessageBusConnection = connect(lifetime.createNestedDisposable()) +fun MessageBus.connect(lifetime: Lifetime): MessageBusConnection = connect(lifetime.createNestedDisposable()) diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ProjectModule.kt b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ProjectModule.kt index ada61e353513..0abe3849988f 100644 --- a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ProjectModule.kt +++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ProjectModule.kt @@ -5,8 +5,9 @@ import com.intellij.openapi.util.NlsSafe import com.intellij.openapi.vfs.VirtualFile import com.intellij.pom.Navigatable import com.jetbrains.packagesearch.intellij.plugin.ui.toolwindow.models.PackageVersion +import org.jetbrains.annotations.ApiStatus -internal data class ProjectModule( +data class ProjectModule( val name: String, val nativeModule: Module, val parent: ProjectModule?, diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ProjectModuleOperationProvider.kt b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ProjectModuleOperationProvider.kt index b2186c3b4dd6..a337dc045eea 100644 --- a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ProjectModuleOperationProvider.kt +++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ProjectModuleOperationProvider.kt @@ -1,15 +1,15 @@ package com.jetbrains.packagesearch.intellij.plugin.extensibility -import com.intellij.openapi.extensions.ExtensionPointName -import com.intellij.openapi.project.Project -import com.intellij.openapi.vfs.VirtualFile -import com.intellij.psi.PsiFile import com.intellij.buildsystem.model.OperationFailure import com.intellij.buildsystem.model.OperationItem import com.intellij.buildsystem.model.unified.UnifiedDependency import com.intellij.buildsystem.model.unified.UnifiedDependencyRepository +import com.intellij.openapi.extensions.ExtensionPointName +import com.intellij.openapi.project.Project +import com.intellij.openapi.vfs.VirtualFile +import com.intellij.psi.PsiFile -internal interface ProjectModuleOperationProvider { +interface ProjectModuleOperationProvider { companion object { diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ProjectModuleProvider.kt b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ProjectModuleProvider.kt index b124d2d2191a..e7c9612aacef 100644 --- a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ProjectModuleProvider.kt +++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ProjectModuleProvider.kt @@ -4,7 +4,7 @@ import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.project.Project import kotlin.streams.asSequence -internal interface ProjectModuleProvider { +interface ProjectModuleProvider { companion object { diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ProjectModuleType.kt b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ProjectModuleType.kt index 58f81b889bf8..44a0c755ef2c 100644 --- a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ProjectModuleType.kt +++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/ProjectModuleType.kt @@ -1,14 +1,13 @@ package com.jetbrains.packagesearch.intellij.plugin.extensibility import com.intellij.openapi.project.Project -import com.jetbrains.packagesearch.intellij.plugin.api.model.StandardV2Package import javax.swing.Icon enum class ProjectModuleTypeTerm { SCOPE } -internal interface ProjectModuleType { +interface ProjectModuleType { val icon: Icon? val packageIcon: Icon? @@ -16,6 +15,4 @@ internal interface ProjectModuleType { fun scopes(project: Project): List fun defaultScope(project: Project): String - - fun providesSupportFor(dependency: StandardV2Package): Boolean } diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/RepositoryDeclaration.kt b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/RepositoryDeclaration.kt index 0ad6ee84fbb4..dc8de163d14d 100644 --- a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/RepositoryDeclaration.kt +++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/RepositoryDeclaration.kt @@ -1,6 +1,6 @@ package com.jetbrains.packagesearch.intellij.plugin.extensibility -internal data class RepositoryDeclaration( +data class RepositoryDeclaration( val id: String?, val name: String?, val url: String?, diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/RepositoryOperationMetadata.kt b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/RepositoryOperationMetadata.kt index 62a7f7b96db7..ab212c0cf920 100644 --- a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/RepositoryOperationMetadata.kt +++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/RepositoryOperationMetadata.kt @@ -1,6 +1,6 @@ package com.jetbrains.packagesearch.intellij.plugin.extensibility -internal data class RepositoryOperationMetadata( +data class RepositoryOperationMetadata( val module: ProjectModule, val groupId: String, val artifactId: String, diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/package-info.java b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/package-info.java new file mode 100644 index 000000000000..4b2d87efd847 --- /dev/null +++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/package-info.java @@ -0,0 +1,4 @@ +@ApiStatus.Experimental +package com.jetbrains.packagesearch.intellij.plugin.extensibility; + +import org.jetbrains.annotations.ApiStatus; diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensions/gradle/GradleProjectModuleProvider.kt b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensions/gradle/GradleProjectModuleProvider.kt index 64cb3f6439c3..c13f0f95363c 100644 --- a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensions/gradle/GradleProjectModuleProvider.kt +++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensions/gradle/GradleProjectModuleProvider.kt @@ -13,7 +13,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.PsiManager import com.intellij.psi.util.PsiUtil -import com.jetbrains.packagesearch.intellij.plugin.extensibility.BuildSystemType.GRADLE_GROOVY +import com.jetbrains.packagesearch.intellij.plugin.extensibility.BuildSystemType import com.jetbrains.packagesearch.intellij.plugin.extensibility.ProjectModule import com.jetbrains.packagesearch.intellij.plugin.extensibility.ProjectModuleProvider import com.jetbrains.packagesearch.intellij.plugin.ui.toolwindow.models.PackageVersion @@ -65,7 +65,7 @@ internal open class GradleProjectModuleProvider : ProjectModuleProvider { nativeModule = nativeModule, parent = null, buildFile = buildVirtualFile, - buildSystemType = GRADLE_GROOVY, + buildSystemType = BuildSystemType.GRADLE_GROOVY, moduleType = GradleProjectModuleType ).apply { getNavigatableDependency = createNavigatableDependencyCallback(project, buildVirtualFile) @@ -119,7 +119,7 @@ internal open class GradleProjectModuleProvider : ProjectModuleProvider { nativeModule = nativeModule, parent = currentModule, buildFile = projectBuildFile, - buildSystemType = GRADLE_GROOVY, + buildSystemType = BuildSystemType.GRADLE_GROOVY, moduleType = GradleProjectModuleType ) diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensions/gradle/GradleProjectModuleType.kt b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensions/gradle/GradleProjectModuleType.kt index d8515ba5256e..e7445be57bd6 100644 --- a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensions/gradle/GradleProjectModuleType.kt +++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensions/gradle/GradleProjectModuleType.kt @@ -26,8 +26,4 @@ internal object GradleProjectModuleType : ProjectModuleType { override fun scopes(project: Project): List = packageSearchGradleConfigurationForProject(project).getGradleScopes() - override fun providesSupportFor(dependency: StandardV2Package): Boolean { - // For Gradle modules, allow working with any dependency that is not an MPP root - return dependency.mpp?.moduleType == null || dependency.mpp.moduleType != MppModuleType.ROOT - } } diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensions/maven/MavenProjectModuleProvider.kt b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensions/maven/MavenProjectModuleProvider.kt index 2cc58e38e0a3..38baa736a30a 100644 --- a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensions/maven/MavenProjectModuleProvider.kt +++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensions/maven/MavenProjectModuleProvider.kt @@ -3,7 +3,7 @@ package com.jetbrains.packagesearch.intellij.plugin.extensions.maven import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.project.Project -import com.jetbrains.packagesearch.intellij.plugin.extensibility.BuildSystemType.MAVEN +import com.jetbrains.packagesearch.intellij.plugin.extensibility.BuildSystemType import com.jetbrains.packagesearch.intellij.plugin.extensibility.ProjectModule import com.jetbrains.packagesearch.intellij.plugin.extensibility.ProjectModuleProvider import com.jetbrains.packagesearch.intellij.plugin.ui.toolwindow.models.PackageVersion @@ -33,7 +33,7 @@ internal class MavenProjectModuleProvider : ProjectModuleProvider { nativeModule = module, parent = null, buildFile = mavenProject.file, - buildSystemType = MAVEN, + buildSystemType = BuildSystemType.MAVEN, moduleType = MavenProjectModuleType ).apply { getNavigatableDependency = createNavigatableDependencyCallback(project, mavenProject) diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensions/maven/MavenProjectModuleType.kt b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensions/maven/MavenProjectModuleType.kt index 578937745053..33addee71941 100644 --- a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensions/maven/MavenProjectModuleType.kt +++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensions/maven/MavenProjectModuleType.kt @@ -26,9 +26,4 @@ internal object MavenProjectModuleType : ProjectModuleType { override fun scopes(project: Project): List = packageSearchMavenConfigurationForProject(project).getMavenScopes() - - override fun providesSupportFor(dependency: StandardV2Package): Boolean { - // For Maven modules, allow working with any dependency that is not an MPP root - return dependency.mpp?.moduleType == null || dependency.mpp.moduleType != MppModuleType.ROOT - } } diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/ui/toolwindow/models/PackageVersion.kt b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/ui/toolwindow/models/PackageVersion.kt index 8b937bac2484..c53475b04d94 100644 --- a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/ui/toolwindow/models/PackageVersion.kt +++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/ui/toolwindow/models/PackageVersion.kt @@ -7,7 +7,7 @@ import com.jetbrains.packagesearch.intellij.plugin.version.looksLikeStableVersio import org.jetbrains.annotations.Nls import org.jetbrains.annotations.NonNls -internal sealed class PackageVersion( +sealed class PackageVersion( open val versionName: String, open val isStable: Boolean ) : Comparable { @@ -43,7 +43,7 @@ internal sealed class PackageVersion( companion object { - fun from(rawVersion: StandardV2Version): PackageVersion { + internal fun from(rawVersion: StandardV2Version): PackageVersion { if (rawVersion.version.isBlank()) return Missing return Named(rawVersion.version.trim(), rawVersion.stable) }