From 49f2467978c676f6ce891fc8f00bdc4cde9bf174 Mon Sep 17 00:00:00 2001 From: Sergey Patrikeev Date: Fri, 2 Aug 2019 12:41:33 +0300 Subject: [PATCH] IDE external annotations: get rid of unnecessary product codes, download ideaIU annotations always. GitOrigin-RevId: 19b199ce938efac7f49e6355f181337e25a3df6f --- .../PublicIdeExternalAnnotationsRepository.kt | 15 ++++----------- .../update/IdeExternalAnnotationsUpdater.kt | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/plugins/devkit/devkit-core/src/inspections/missingApi/resolve/PublicIdeExternalAnnotationsRepository.kt b/plugins/devkit/devkit-core/src/inspections/missingApi/resolve/PublicIdeExternalAnnotationsRepository.kt index 930c8b6461a5..3e37eafbd6d0 100644 --- a/plugins/devkit/devkit-core/src/inspections/missingApi/resolve/PublicIdeExternalAnnotationsRepository.kt +++ b/plugins/devkit/devkit-core/src/inspections/missingApi/resolve/PublicIdeExternalAnnotationsRepository.kt @@ -31,22 +31,15 @@ class PublicIdeExternalAnnotationsRepository(private val project: Project) : Ide SNAPSHOTS_REPO_URL ) - private val allProductCodes = listOf("IU", "IC", "RM", "PY", "PC", "PE", "PS", "WS", "OC", "CL", "DB", "RD", "GO", "MPS", "AI") - - private val ideaIUAnnotationsCoordinates = "com.jetbrains.intellij.idea" to "ideaIU" + } + private fun getAnnotationsCoordinates(): Pair? { //Currently, for any IDE download ideaIU's annotations. - private val productCodeToAnnotationsCoordinates = allProductCodes.associate { - it to ideaIUAnnotationsCoordinates - } - - fun hasAnnotationsForProduct(productCode: String): Boolean = - productCode in productCodeToAnnotationsCoordinates + return "com.jetbrains.intellij.idea" to "ideaIU" } override fun downloadExternalAnnotations(ideBuildNumber: BuildNumber): IdeExternalAnnotations? { - val productCode = ideBuildNumber.productCode.takeIf { it.isNotEmpty() } ?: "IU" - val (groupId, artifactId) = productCodeToAnnotationsCoordinates[productCode] ?: return null + val (groupId, artifactId) = getAnnotationsCoordinates() ?: return null val lastReleaseVersion = "${ideBuildNumber.baselineVersion}.999999" val lastReleaseAnnotations = tryDownload(groupId, artifactId, lastReleaseVersion, listOf(RELEASES_REPO_DESCRIPTION)) diff --git a/plugins/devkit/devkit-core/src/inspections/missingApi/update/IdeExternalAnnotationsUpdater.kt b/plugins/devkit/devkit-core/src/inspections/missingApi/update/IdeExternalAnnotationsUpdater.kt index d473509519b6..44f6c7377025 100644 --- a/plugins/devkit/devkit-core/src/inspections/missingApi/update/IdeExternalAnnotationsUpdater.kt +++ b/plugins/devkit/devkit-core/src/inspections/missingApi/update/IdeExternalAnnotationsUpdater.kt @@ -62,7 +62,7 @@ class IdeExternalAnnotationsUpdater { } fun updateIdeaJdkAnnotationsIfNecessary(project: Project, ideaJdk: Sdk, buildNumber: BuildNumber) { - if (!isInspectionEnabled(project) || !PublicIdeExternalAnnotationsRepository.hasAnnotationsForProduct(buildNumber.productCode)) { + if (!isInspectionEnabled(project)) { return }