Merge pull request #6908 from microsoft/august-issues

Resolve issues reported in august release

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/FunctionRunConfigurationProducer.java

@@ -101,13 +101,17 @@ public boolean isConfigurationFromContext(AzureRunConfigurationBase appConfigura
     }
 
     private static Location<PsiMethod> getAzureFunctionMethods(final Location<?> location) {
-        for (Iterator<Location<PsiMethod>> iterator = location.getAncestors(PsiMethod.class, false); iterator.hasNext();) {
-            final Location<PsiMethod> methodLocation = iterator.next();
-            if (FunctionUtils.isFunctionClassAnnotated(methodLocation.getPsiElement())) {
-                return methodLocation;
+        try {
+            for (Iterator<Location<PsiMethod>> iterator = location.getAncestors(PsiMethod.class, false); iterator.hasNext(); ) {
+                final Location<PsiMethod> methodLocation = iterator.next();
+                if (FunctionUtils.isFunctionClassAnnotated(methodLocation.getPsiElement())) {
+                    return methodLocation;
+                }
             }
+            return null;
+        } catch (Throwable e) {
+            return null;
         }
-        return null;
     }
 
     private Module findModule(FunctionRunConfiguration configuration, Module contextModule) {

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

@@ -74,6 +74,9 @@ public synchronized void takeSurvey(@Nonnull final Project project, final ICusto
     }
 
     private void showSurveyPopup(final @Nonnull Project project, final ICustomerSurvey survey) {
+        if (project.isDisposed()) {
+            return;
+        }
         final SurveyPopUpDialog popUpDialog = new SurveyPopUpDialog(project, survey, response -> {
             try {
                 if (response == CustomerSurveyResponse.ACCEPT) {

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/function/CreateFunctionAction.java

@@ -158,7 +158,7 @@ protected PsiElement[] create(@NotNull String s, PsiDirectory psiDirectory) thro
     @Override
     protected boolean isAvailable(final DataContext dataContext) {
         final Project project = CommonDataKeys.PROJECT.getData(dataContext);
-        if (project == null) {
+        if (project == null || project.isDisposed()) {
             return false;
         }
         final IdeView view = LangDataKeys.IDE_VIEW.getData(dataContext);