From 2cd0e9c8d851338e9969587f4c2ef13618357773 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 19 May 2016 21:23:33 +0300 Subject: [PATCH] Fix EA-80764. Do not try to get the resource manager for the disposed module (cherry picked from commit c3bd243) (cherry picked from commit cddcf02) --- .../android/synthetic/idea/AndroidPsiTreeChangePreprocessor.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidPsiTreeChangePreprocessor.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidPsiTreeChangePreprocessor.kt index d4af6114279..26154e29e6e 100644 --- a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidPsiTreeChangePreprocessor.kt +++ b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidPsiTreeChangePreprocessor.kt @@ -85,7 +85,7 @@ class AndroidPsiTreeChangePreprocessor : PsiTreeChangePreprocessor, SimpleModifi val module = projectFileIndex.getModuleForFile(xmlFile.virtualFile) ?: (element.parent as? PsiDirectory)?.let { projectFileIndex.getModuleForFile(it.virtualFile) } - if (module != null) { + if (module != null && !module.isDisposed) { val resourceManager = AndroidLayoutXmlFileManager.getInstance(module) ?: return false val resDirectories = resourceManager.getAllModuleResDirectories() val baseDirectory = xmlFile.parent?.parent?.virtualFile