From 32211a7f8f9bcc71a17bbd8a25f926deba96e516 Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Tue, 25 Nov 2014 16:37:23 +0300
Subject: [PATCH] fixed PsiInvalidElementAccessException for invalid elements
 stored in PythonPathCache

clear PythonPathCache on pushLanguageLevel
---
 .../psi/impl/PythonLanguageLevelPusher.java   | 36 ++++++++++++++-----
 .../python/psi/resolve/PythonPathCache.java   |  2 +-
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/python/src/com/jetbrains/python/psi/impl/PythonLanguageLevelPusher.java b/python/src/com/jetbrains/python/psi/impl/PythonLanguageLevelPusher.java
index 9cb4b6a7b8f7..c93f776948ba 100644
--- a/python/src/com/jetbrains/python/psi/impl/PythonLanguageLevelPusher.java
+++ b/python/src/com/jetbrains/python/psi/impl/PythonLanguageLevelPusher.java
@@ -27,8 +27,12 @@ import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.module.ModuleType;
 import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.projectRoots.Sdk;
-import com.intellij.openapi.roots.*;
+import com.intellij.openapi.roots.JdkOrderEntry;
+import com.intellij.openapi.roots.OrderEntry;
+import com.intellij.openapi.roots.OrderRootType;
+import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.roots.impl.FilePropertyPusher;
 import com.intellij.openapi.roots.impl.PushedFilePropertiesUpdater;
 import com.intellij.openapi.util.Key;
@@ -45,6 +49,7 @@ import com.jetbrains.python.PythonFileType;
 import com.jetbrains.python.PythonModuleTypeBase;
 import com.jetbrains.python.facet.PythonFacetSettings;
 import com.jetbrains.python.psi.LanguageLevel;
+import com.jetbrains.python.psi.resolve.PythonSdkPathCache;
 import com.jetbrains.python.sdk.PythonSdkType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -97,22 +102,25 @@ public class PythonLanguageLevelPusher implements FilePropertyPusher<LanguageLev
     return getFileLanguageLevel(project, file);
   }
 
-  public static LanguageLevel getFileLanguageLevel(Project project, VirtualFile file) {
+  public static LanguageLevel getFileLanguageLevel(@NotNull Project project, @Nullable VirtualFile file) {
     if (ApplicationManager.getApplication().isUnitTestMode() && LanguageLevel.FORCE_LANGUAGE_LEVEL != null) {
       return LanguageLevel.FORCE_LANGUAGE_LEVEL;
     }
     if (file == null) return null;
+    final Sdk sdk = getFileSdk(project, file);
+    return PythonSdkType.getLanguageLevelForSdk(sdk);
+  }
 
+  @Nullable
+  private static Sdk getFileSdk(@NotNull Project project, @NotNull VirtualFile file) {
     final Module module = ModuleUtilCore.findModuleForFile(file, project);
     if (module != null) {
       final Sdk sdk = PythonSdkType.findPythonSdk(module);
-      return PythonSdkType.getLanguageLevelForSdk(sdk);
+      if (sdk != null) {
+        return sdk;
+      }
     }
-    final Sdk sdk = findSdk(project, file);
-    if (sdk != null) {
-      return PythonSdkType.getLanguageLevelForSdk(sdk);
-    }
-    return null;
+    return findSdk(project, file);
   }
 
   @Nullable
@@ -167,11 +175,23 @@ public class PythonLanguageLevelPusher implements FilePropertyPusher<LanguageLev
     for (VirtualFile child : fileOrDir.getChildren()) {
       final FileType fileType = FileTypeRegistry.getInstance().getFileTypeByFileName(child.getName());
       if (!child.isDirectory() && PythonFileType.INSTANCE.equals(fileType)) {
+        clearSdkPathCache(child);
         PushedFilePropertiesUpdater.getInstance(project).filePropertiesChanged(child);
       }
     }
   }
 
+  private static void clearSdkPathCache(@NotNull final VirtualFile child) {
+    final Project[] projects = ProjectManager.getInstance().getOpenProjects();
+    for (Project project : projects) {
+      final Sdk sdk = getFileSdk(project, child);
+      if (sdk != null) {
+        final PythonSdkPathCache pathCache = PythonSdkPathCache.getInstance(project, sdk);
+        pathCache.clearCache();
+      }
+    }
+  }
+
   public void afterRootsChanged(@NotNull final Project project) {
     Set<Sdk> updatedSdks = new HashSet<Sdk>();
     final Module[] modules = ModuleManager.getInstance(project).getModules();
diff --git a/python/src/com/jetbrains/python/psi/resolve/PythonPathCache.java b/python/src/com/jetbrains/python/psi/resolve/PythonPathCache.java
index d2c0aa684fcd..efa6b813292b 100644
--- a/python/src/com/jetbrains/python/psi/resolve/PythonPathCache.java
+++ b/python/src/com/jetbrains/python/psi/resolve/PythonPathCache.java
@@ -31,7 +31,7 @@ public abstract class PythonPathCache {
   private final Map<QualifiedName, List<PsiElement>> myCache = new HashMap<QualifiedName, List<PsiElement>>();
   private final Map<VirtualFile, List<QualifiedName>> myQNameCache = new HashMap<VirtualFile, List<QualifiedName>>();
 
-  protected void clearCache() {
+  public void clearCache() {
     myCache.clear();
     myQNameCache.clear();
   }