Merge pull request #6809 from microsoft/fixes-endgame-202207

Resolve issues in end game

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-guidance/src/main/java/com/microsoft/azure/toolkit/ide/guidance/GuidanceStartupListener.java

@@ -21,7 +21,7 @@ public void runActivity(@NotNull Project project) {
                 .ifPresent(config -> GuidanceViewManager.getInstance().openCourseView(project, courseConfigFromWorkspace));
         // show guidance tool window after install
         final IIdeStore ideStore = AzureStoreManager.getInstance().getIdeStore();
-        if (StringUtils.isEmpty(ideStore.getProperty(GUIDANCE, GUIDANCE_SHOWN))) {
+        if (ideStore != null && StringUtils.isEmpty(ideStore.getProperty(GUIDANCE, GUIDANCE_SHOWN))) {
             ideStore.setProperty(GUIDANCE, GUIDANCE_SHOWN, String.valueOf(true));
             GuidanceViewManager.getInstance().showCoursesView(project);
         }

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

@@ -105,10 +105,13 @@ private static Icon getFileTypeIcon(final String name) {
 
     @Nullable
     private static Icon loadIcon(String iconPathOrName, Class<?> clazz) {
+        if (StringUtils.isBlank(iconPathOrName)) {
+            return null;
+        }
         try {
             final Icon result = IconLoader.getIcon(iconPathOrName, clazz);
             return result.getIconHeight() > 1 ? result : null; // IconLoader may return dot for non-existing icon
-        } catch (final RuntimeException ise) {
+        } catch (final Throwable ise) {
             return null;
         }
     }

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

@@ -150,7 +150,6 @@ private void refreshChildrenView() {
         @Override
         @AzureOperation(name = "common.load_children.node", params = "this.getLabel()", type = AzureOperation.Type.ACTION)
         public synchronized void refreshChildren(boolean... incremental) {
-            Optional.ofNullable(this.inner).ifPresent(ignore -> this.setAllowsChildren(inner.hasChildren()));
             if (this.getAllowsChildren() && BooleanUtils.isNotFalse(this.loaded)) {
                 final DefaultTreeModel model = (DefaultTreeModel) this.tree.getModel();
                 if (incremental.length > 0 && incremental[0] && Objects.nonNull(model)) {
@@ -162,9 +161,6 @@ public synchronized void refreshChildren(boolean... incremental) {
                 }
                 this.loaded = null;
                 this.loadChildren(incremental);
-            } else if (!this.getAllowsChildren()) {
-                this.removeAllChildren();
-                this.refreshChildrenView();
             }
         }