From 180ae070ee86ea3e4c3770de29ee21345f993759 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Wed, 16 Nov 2016 14:13:03 +0100
Subject: [PATCH] Fixed KotlinAndroidResourceQuickFixProvider for AS 2.2

---
 .../inspection/KotlinAndroidResourceQuickFixProvider.kt    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/inspection/KotlinAndroidResourceQuickFixProvider.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/inspection/KotlinAndroidResourceQuickFixProvider.kt
index 36af4ffd5e1..212890d020a 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/inspection/KotlinAndroidResourceQuickFixProvider.kt
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/inspection/KotlinAndroidResourceQuickFixProvider.kt
@@ -16,6 +16,7 @@
 
 package org.jetbrains.kotlin.android.inspection
 
+import com.android.resources.ResourceFolderType
 import com.android.resources.ResourceType
 import com.intellij.codeInsight.daemon.QuickFixActionRegistrar
 import com.intellij.codeInsight.quickfix.UnresolvedReferenceQuickFixProvider
@@ -48,8 +49,10 @@ class KotlinAndroidResourceQuickFixProvider : UnresolvedReferenceQuickFixProvide
         if (AndroidResourceUtil.ALL_VALUE_RESOURCE_TYPES.contains(resourceType)) {
             registrar.register(CreateValueResourceQuickFix(facet, resourceType, info.fieldName, contextFile, true))
         }
-        if (AndroidResourceUtil.XML_FILE_RESOURCE_TYPES.contains(resourceType)) {
-            registrar.register(CreateFileResourceQuickFix(facet, resourceType, info.fieldName, contextFile, true))
+
+        val folderType = AndroidResourceUtil.XML_FILE_RESOURCE_TYPES[resourceType] as? ResourceFolderType
+        if (folderType != null) {
+            registrar.register(CreateFileResourceQuickFix(facet, folderType, info.fieldName, contextFile, true))
         }
     }