From 5e4459f41d494be32ce2989e2ee3b79f03216930 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Mon, 6 Mar 2017 14:31:01 +0300 Subject: [PATCH] Fix broken MultiFileHighlightingTest Android resource folding builder should not run in non-Android projects --- .../kotlin/android/folding/ResourceFoldingBuilder.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/folding/ResourceFoldingBuilder.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/folding/ResourceFoldingBuilder.kt index 1aeaad546b3..ce4b3113f63 100644 --- a/idea/idea-android/src/org/jetbrains/kotlin/android/folding/ResourceFoldingBuilder.kt +++ b/idea/idea-android/src/org/jetbrains/kotlin/android/folding/ResourceFoldingBuilder.kt @@ -32,9 +32,9 @@ import com.intellij.openapi.editor.Document import com.intellij.openapi.module.ModuleUtilCore import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.PsiClass -import com.intellij.psi.PsiClassOwner import com.intellij.psi.PsiElement import com.intellij.psi.impl.source.SourceTreeToPsiMap +import org.jetbrains.android.facet.AndroidFacet import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.uast.* import org.jetbrains.uast.visitor.AbstractUastVisitor @@ -72,7 +72,7 @@ class ResourceFoldingBuilder : FoldingBuilderEx() { } override fun buildFoldRegions(root: PsiElement, document: Document, quick: Boolean): Array { - if (root !is KtFile || quick && !UNIT_TEST_MODE || !isFoldingEnabled) { + if (root !is KtFile || quick && !UNIT_TEST_MODE || !isFoldingEnabled || AndroidFacet.getInstance(root) == null) { return emptyArray() }