From 59055e28eecfee6fd44d8e7e6b2c88870fff94e4 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Mon, 14 Nov 2016 17:24:04 +0100 Subject: [PATCH] CreateFileResourceQuickFix now accepts ResourceFolderType instead of ResourceType (cherry picked from commit 55f350f) --- .../inspection/KotlinAndroidResourceQuickFixProvider.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 212890d020a..61bfee3fa35 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 @@ -49,10 +49,11 @@ class KotlinAndroidResourceQuickFixProvider : UnresolvedReferenceQuickFixProvide if (AndroidResourceUtil.ALL_VALUE_RESOURCE_TYPES.contains(resourceType)) { registrar.register(CreateValueResourceQuickFix(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)) + if (AndroidResourceUtil.XML_FILE_RESOURCE_TYPES.contains(resourceType)) { + val resourceFolderType = ResourceFolderType.getTypeByName(resourceType.getName()); + if (resourceFolderType != null) { + registrar.register(CreateFileResourceQuickFix(facet, resourceFolderType, info.fieldName, contextFile, true)) + } } }