Merge pull request #7740 from microsoft/hanli/fixes-202307

Resolve issues found in end game

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-bicep/src/main/resources/META-INF/azure-intellij-plugin-bicep.xml

@@ -28,30 +28,30 @@
                                 id="org.wso2.lsp4intellij.contributors.LSPCompletionContributor" language="any"/>
         <!-- needed for completion as well as signature help -->
         <typedHandler implementation="org.wso2.lsp4intellij.listeners.LSPTypedHandler"
-                      id="LSPTypedHandler"/>
+                      id="Azure.LSPTypedHandler"/>
 
         <!-- needed for code diagnostics -->
-        <externalAnnotator id="LSPAnnotator" language="TEXT"
+        <externalAnnotator id="Azure.LSPAnnotator" language="TEXT"
                            implementationClass="org.wso2.lsp4intellij.contributors.annotator.LSPAnnotator"/>
 
         <!-- needed for Workspace Symbols -->
         <gotoSymbolContributor implementation="org.wso2.lsp4intellij.contributors.symbol.LSPSymbolContributor"
-                               id="LSPSymbolContributor"/>
+                               id="Azure.LSPSymbolContributor"/>
 
         <!-- needed for renaming -->
-        <renameHandler implementation="org.wso2.lsp4intellij.contributors.rename.LSPRenameHandler" id="LSPRenameHandler" order="first"/>
-        <renamePsiElementProcessor implementation="org.wso2.lsp4intellij.contributors.rename.LSPRenameProcessor" id="LSPRenameProcessor" order="first"/>
+        <renameHandler implementation="org.wso2.lsp4intellij.contributors.rename.LSPRenameHandler" id="Azure.LSPRenameHandler" order="first"/>
+        <renamePsiElementProcessor implementation="org.wso2.lsp4intellij.contributors.rename.LSPRenameProcessor" id="Azure.LSPRenameProcessor" order="first"/>
     </extensions>
 
     <actions>
         <!-- needed for hover -->
         <action id="org.intellij.sdk.action.QuickDocAction" class="org.wso2.lsp4intellij.actions.LSPQuickDocAction" text="Show Quick Doc"/>
-        <action class="org.wso2.lsp4intellij.actions.LSPGotoDeclarationAction" id="GotoDeclaration" use-shortcut-of="GotoDeclaration"
+        <action class="org.wso2.lsp4intellij.actions.LSPGotoDeclarationAction" id="Azure.GotoDeclaration" use-shortcut-of="GotoDeclaration"
                 overrides="true" text="Go to Declaration or Usages"/>
-        <action class="org.wso2.lsp4intellij.actions.LSPReformatAction" id="ReformatCode" use-shortcut-of="ReformatCode"
+        <action class="org.wso2.lsp4intellij.actions.LSPReformatAction" id="Azure.ReformatCode" use-shortcut-of="ReformatCode"
                 overrides="true" text="Reformat Code" />
         <!-- needed for find references -->
-        <action class="org.wso2.lsp4intellij.actions.LSPReferencesAction" id="LSPFindUsages" text="Find Usages">
+        <action class="org.wso2.lsp4intellij.actions.LSPReferencesAction" id="Azure.LSPFindUsages" text="Find Usages">
             <keyboard-shortcut first-keystroke="shift alt F7" keymap="$default"/>
         </action>
     </actions>

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-monitor/src/main/java/com/microsoft/azure/toolkit/intellij/monitor/view/AzureMonitorView.java

@@ -26,6 +26,9 @@
 import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
 import com.microsoft.azure.toolkit.lib.common.bundle.AzureString;
 import com.microsoft.azure.toolkit.lib.common.event.AzureEventBus;
+import com.microsoft.azure.toolkit.lib.common.messager.AzureMessage;
+import com.microsoft.azure.toolkit.lib.common.messager.AzureMessager;
+import com.microsoft.azure.toolkit.lib.common.messager.IAzureMessager;
 import com.microsoft.azure.toolkit.lib.common.model.Subscription;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
@@ -69,15 +72,20 @@ public AzureMonitorView(Project project, @Nullable LogAnalyticsWorkspace logAnal
             this.updateWorkspaceNameLabel();
             Optional.ofNullable(this.selectedWorkspace).ifPresent(w -> PropertiesComponent.getInstance().setValue(AzureMonitorManager.AZURE_MONITOR_SELECTED_WORKSPACE, w.getId()));
         });
+        final IAzureMessager messager = AzureMessager.getMessager();
         this.subscriptionChangeListener = new AzureEventBus.EventListener(e -> {
             LogAnalyticsWorkspace defaultWorkspace = null;
             final Account account = Azure.az(AzureAccount.class).account();
             if (Objects.nonNull(account) && account.getSelectedSubscriptions().size() > 0) {
                 final Subscription subscription = account.getSelectedSubscriptions().get(0);
-                final List<LogAnalyticsWorkspace> workspaceList = Azure.az(AzureLogAnalyticsWorkspace.class)
-                        .logAnalyticsWorkspaces(subscription.getId()).list().stream().toList();
-                if (workspaceList.size() > 0) {
-                    defaultWorkspace = workspaceList.get(0);
+                try {
+                    final List<LogAnalyticsWorkspace> workspaceList = Azure.az(AzureLogAnalyticsWorkspace.class)
+                            .logAnalyticsWorkspaces(subscription.getId()).list().stream().toList();
+                    if (workspaceList.size() > 0) {
+                        defaultWorkspace = workspaceList.get(0);
+                    }
+                } catch (final Throwable t) {
+                    messager.error(t);
                 }
             }
             this.selectedWorkspace = defaultWorkspace;