azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Not throw exception when cidr has been registered already

Browse Source 
This is to avoid failures from some Android Studio tests depending on cidr.
This commit is contained in:
Juan Chen
2019-07-02 17:10:31 -07:00
committed by Nikolay Krasko
parent 9f6e88d571
commit d33d1913cb
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/testResourceBundle.kt.as35
+1 -2
View File
@@ -10,7 +10,6 @@ package org.jetbrains.kotlin.idea
import com.intellij.featureStatistics.FeatureStatisticsBundleProvider import com.intellij.featureStatistics.FeatureStatisticsBundleProvider
import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.extensions.Extensions import com.intellij.openapi.extensions.Extensions
import java.lang.IllegalStateException
private const val CIDR_FEATURE_STATISTICS_PROVIDER_FQNAME = "com.jetbrains.cidr.lang.OCFeatureStatisticsBundleProvider" 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 provider.javaClass.name == CIDR_FEATURE_STATISTICS_PROVIDER_FQNAME
} }
if (isAlreadyRegistered) { if (isAlreadyRegistered) {
throw IllegalStateException("Remove this registration for the current platform: bundle is already registered.") return
} }
val cidrFSBundleProviderClass = try { val cidrFSBundleProviderClass = try {