From a170069ea0d77c8d0e09b8e4d9a7fc094aa1a20e Mon Sep 17 00:00:00 2001
From: Aydar Mukhametzyanov <aydar.mukhametzyanov@jetbrains.com>
Date: Thu, 28 Mar 2024 09:57:51 +0100
Subject: [PATCH] IDEA-344208 Use BTU.tryComputeFast and catch IOException

GitOrigin-RevId: f1cd0db00c30448705ff58f33d32c551ed7e8506
---
 .../OnboardingBackgroundImageProviderBase.kt  | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/OnboardingBackgroundImageProviderBase.kt b/platform/platform-impl/src/com/intellij/openapi/wm/impl/OnboardingBackgroundImageProviderBase.kt
index e78a09a249b7..406cb306ddb3 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/OnboardingBackgroundImageProviderBase.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/OnboardingBackgroundImageProviderBase.kt
@@ -3,7 +3,6 @@ package com.intellij.openapi.wm.impl
 
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.progress.util.BackgroundTaskUtil
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.ui.OnboardingBackgroundImageProvider
@@ -14,6 +13,7 @@ import com.intellij.util.SVGLoader
 import com.intellij.util.ui.JBInsets
 import org.jetbrains.annotations.ApiStatus.Internal
 import java.awt.Image
+import java.io.IOException
 import java.net.URL
 
 @Internal
@@ -23,21 +23,21 @@ abstract class OnboardingBackgroundImageProviderBase : OnboardingBackgroundImage
   override fun getImage(): Image? {
     val imageUrl = getImageUrl()?.takeIf { isAvailable && it.path.endsWith(".svg"); } ?: return null
 
-    var image: Image? = null
-    BackgroundTaskUtil.executeAndTryWait(
-      { indicator: ProgressIndicator ->
-        val loadedImage = SVGLoader.load(imageUrl, 1f)
-
-        Runnable {
-          if (indicator.isCanceled) return@Runnable
-          image = loadedImage
+    val image: Image? = BackgroundTaskUtil.tryComputeFast(
+      { progressIndicator ->
+        try {
+          return@tryComputeFast SVGLoader.load(imageUrl, 1f)
         }
-      },
-      {
-        LOG.warn("Onboarding image loading failed (> $LOADING_TIMEOUT_MILLIS ms): ")
-      },
-      LOADING_TIMEOUT_MILLIS,
-      false)
+        catch (e: IOException) {
+          LOG.warn("Onboarding image loading failed: $e")
+          return@tryComputeFast null
+        }
+        finally {
+          if (progressIndicator.isCanceled) {
+            LOG.warn("Onboarding image loading failed: it took longer than $LOADING_TIMEOUT_MILLIS ms")
+          }
+        }
+      }, LOADING_TIMEOUT_MILLIS)
 
     return image
   }