Merge branch 'endgame-june' into endgame-june.next

Author: Flanker32

PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml

@@ -28,7 +28,7 @@
     <parent>
     <groupId>com.microsoft.azuretools</groupId>
     <artifactId>utils</artifactId>
-    <version>3.53.0</version>
+    <version>3.54.0</version>
     </parent>
     <groupId>com.microsoft.azuretools</groupId>
     <artifactId>com.microsoft.azuretools.sdk.lib</artifactId>
@@ -38,7 +38,7 @@
     <organization><name>Microsoft Corp.</name></organization>
 
     <properties>
-        <azuretool.version>3.53.0</azuretool.version>
+        <azuretool.version>3.54.0</azuretool.version>
         <azuretool.sdk.version>3.25.0.qualifier</azuretool.sdk.version>
     </properties>
     <dependencies>

PluginsAndFeatures/azure-toolkit-for-intellij/.idea/misc.xml

@@ -12,7 +12,7 @@
 import com.intellij.ui.SimpleListCellRenderer;
 import com.intellij.ui.components.fields.ExtendableTextComponent;
 import com.intellij.ui.components.fields.ExtendableTextField;
-import com.microsoft.azure.toolkit.lib.common.exception.AzureExceptionHandler;
+import com.microsoft.azure.toolkit.lib.common.messager.AzureMessager;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
@@ -279,7 +279,12 @@ protected T getDefaultValue() {
     }
 
     protected void handleLoadingError(Throwable e) {
-        AzureExceptionHandler.onRxException(e);
+        final Throwable rootCause = ExceptionUtils.getRootCause(e);
+        if (rootCause instanceof InterruptedIOException || rootCause instanceof InterruptedException) {
+            // Swallow interrupted exception caused by unsubscribe
+            return;
+        }
+        AzureMessager.getMessager().error(e);
     }
 
     protected boolean isFilterable() {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureComboBox.java

@@ -10,6 +10,7 @@
 import com.microsoft.azure.toolkit.lib.common.form.AzureForm;
 import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
 import com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo;
+import com.microsoft.azure.toolkit.lib.common.messager.AzureMessager;
 import lombok.extern.java.Log;
 
 import javax.swing.*;
@@ -35,11 +36,15 @@ public AzureDialog() {
 
     @Override
     protected void doOKAction() {
-        if (Objects.nonNull(this.okActionListener)) {
-            final T data = this.getForm().getData();
-            this.okActionListener.onOk(data);
-        } else {
-            super.doOKAction();
+        try {
+            if (Objects.nonNull(this.okActionListener)) {
+                final T data = this.getForm().getData();
+                this.okActionListener.onOk(data);
+            } else {
+                super.doOKAction();
+            }
+        } catch (final Exception e) {
+            AzureMessager.getMessager().error(e);
         }
     }