From b916a8e911d84fff656993363fb0c8a97606f1de Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 20 Feb 2020 20:50:59 +0100 Subject: [PATCH] rethrow PCE GitOrigin-RevId: 02e35e45aac65f2c21bb96fea0868c9a81ac2e4f --- .../openapi/projectRoots/impl/UnknownSdkCollector.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/UnknownSdkCollector.kt b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/UnknownSdkCollector.kt index 53d502c8da9e..dd26ddc7b98e 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/UnknownSdkCollector.kt +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/UnknownSdkCollector.kt @@ -7,13 +7,14 @@ import com.intellij.openapi.application.ReadAction import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.module.ModuleManager +import com.intellij.openapi.progress.ProcessCanceledException import com.intellij.openapi.progress.ProgressManager.checkCanceled import com.intellij.openapi.project.Project import com.intellij.openapi.projectRoots.SdkType -import com.intellij.openapi.roots.ui.configuration.UnknownSdk import com.intellij.openapi.roots.ModuleJdkOrderEntry import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.ProjectRootManager +import com.intellij.openapi.roots.ui.configuration.UnknownSdk import com.intellij.util.concurrency.AppExecutorUtil import java.util.* import java.util.function.Consumer @@ -115,6 +116,8 @@ class UnknownSdkCollector(private val myProject: Project) { EP_NAME.forEachExtensionSafe { val contrib = try { it.contributeUnknownSdks(myProject) + } catch (e: ProcessCanceledException) { + throw e } catch (t: Throwable) { LOG.warn("Failed to contribute SDKs with ${it.javaClass.name}. ${t.message}", t) listOf()