From d33d1913cbfaf4257c3220eec9fd28b701388ab7 Mon Sep 17 00:00:00 2001 From: Juan Chen Date: Tue, 2 Jul 2019 17:10:31 -0700 Subject: [PATCH] Not throw exception when cidr has been registered already This is to avoid failures from some Android Studio tests depending on cidr. --- idea/src/org/jetbrains/kotlin/idea/testResourceBundle.kt.as35 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/testResourceBundle.kt.as35 b/idea/src/org/jetbrains/kotlin/idea/testResourceBundle.kt.as35 index 52783db2008..dace666ba76 100644 --- a/idea/src/org/jetbrains/kotlin/idea/testResourceBundle.kt.as35 +++ b/idea/src/org/jetbrains/kotlin/idea/testResourceBundle.kt.as35 @@ -10,7 +10,6 @@ package org.jetbrains.kotlin.idea import com.intellij.featureStatistics.FeatureStatisticsBundleProvider import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.extensions.Extensions -import java.lang.IllegalStateException private const val CIDR_FEATURE_STATISTICS_PROVIDER_FQNAME = "com.jetbrains.cidr.lang.OCFeatureStatisticsBundleProvider" @@ -24,7 +23,7 @@ fun registerAdditionalResourceBundleInTests() { provider.javaClass.name == CIDR_FEATURE_STATISTICS_PROVIDER_FQNAME } if (isAlreadyRegistered) { - throw IllegalStateException("Remove this registration for the current platform: bundle is already registered.") + return } val cidrFSBundleProviderClass = try {