Skip to content

Commit 5e4459f

Browse files
committed
Fix broken MultiFileHighlightingTest
Android resource folding builder should not run in non-Android projects
1 parent 0111c4d commit 5e4459f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

idea/idea-android/src/org/jetbrains/kotlin/android/folding/ResourceFoldingBuilder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ import com.intellij.openapi.editor.Document
3232
import com.intellij.openapi.module.ModuleUtilCore
3333
import com.intellij.openapi.util.text.StringUtil
3434
import com.intellij.psi.PsiClass
35-
import com.intellij.psi.PsiClassOwner
3635
import com.intellij.psi.PsiElement
3736
import com.intellij.psi.impl.source.SourceTreeToPsiMap
37+
import org.jetbrains.android.facet.AndroidFacet
3838
import org.jetbrains.kotlin.psi.KtFile
3939
import org.jetbrains.uast.*
4040
import org.jetbrains.uast.visitor.AbstractUastVisitor
@@ -72,7 +72,7 @@ class ResourceFoldingBuilder : FoldingBuilderEx() {
7272
}
7373

7474
override fun buildFoldRegions(root: PsiElement, document: Document, quick: Boolean): Array<FoldingDescriptor> {
75-
if (root !is KtFile || quick && !UNIT_TEST_MODE || !isFoldingEnabled) {
75+
if (root !is KtFile || quick && !UNIT_TEST_MODE || !isFoldingEnabled || AndroidFacet.getInstance(root) == null) {
7676
return emptyArray()
7777
}
7878

0 commit comments

Comments
 (0)