From e12deb54d64cee0e907cf32f4981955108f516f8 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Fri, 19 Jan 2018 14:22:04 +0300
Subject: [PATCH] Android Extensions: Fix "Inconsistent file tree" exception on
 Activity creation (KT-22349)

---
 .../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 516bd55f808..10bc73c7076 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
@@ -100,7 +100,7 @@ class AndroidPsiTreeChangePreprocessor : PsiTreeChangePreprocessor, SimpleModifi
 
         private fun PsiFile.getContainingDirectorySafe(): PsiDirectory? {
             val virtualFile = this.viewProvider.virtualFile.takeIf { it.isValid } ?: return null
-            val parentDirectory = virtualFile.parent.takeIf { it.isValid } ?: return null
+            val parentDirectory = virtualFile.parent?.takeIf { it.isValid } ?: return null
             return this.manager.findDirectory(parentDirectory)
         }