From ec0abb0854ca01c13870e73187dc8f59464a52ae Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 7 Mar 2018 00:12:05 +0300 Subject: [PATCH] Fix EA-79206: Process only valid layout .xml files in Android Extensions --- .../synthetic/idea/res/IDEAndroidLayoutXmlFileManager.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/res/IDEAndroidLayoutXmlFileManager.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidLayoutXmlFileManager.kt index ab6ebb59020..5a8ce10fc7a 100644 --- a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidLayoutXmlFileManager.kt +++ b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidLayoutXmlFileManager.kt @@ -63,7 +63,7 @@ class IDEAndroidLayoutXmlFileManager(val module: Module) : AndroidLayoutXmlFileM } override fun doExtractResources(layoutGroup: AndroidLayoutGroupData, module: ModuleDescriptor): AndroidLayoutGroup { - val layouts = layoutGroup.layouts.map { layout -> + val layouts = layoutGroup.layouts.filter { it.isValid }.map { layout -> val resources = arrayListOf() layout.accept(AndroidXmlVisitor { id, widgetType, attribute -> resources += parseAndroidResource(id, widgetType, attribute.valueElement)