azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix broken MultiFileHighlightingTest

Browse Source 
Android resource folding builder should not run in non-Android projects
This commit is contained in:
Vyacheslav Gerasimov
2017-03-06 14:31:01 +03:00
parent 0111c4d581
commit 5e4459f41d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-android/src/org/jetbrains/kotlin/android/folding/ResourceFoldingBuilder.kt
+2 -2
View File
@@ -32,9 +32,9 @@ import com.intellij.openapi.editor.Document
import com.intellij.openapi.module.ModuleUtilCore import com.intellij.openapi.module.ModuleUtilCore
import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.util.text.StringUtil
import com.intellij.psi.PsiClass import com.intellij.psi.PsiClass
import com.intellij.psi.PsiClassOwner
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.impl.source.SourceTreeToPsiMap import com.intellij.psi.impl.source.SourceTreeToPsiMap
import org.jetbrains.android.facet.AndroidFacet
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.uast.* import org.jetbrains.uast.*
import org.jetbrains.uast.visitor.AbstractUastVisitor import org.jetbrains.uast.visitor.AbstractUastVisitor
@@ -72,7 +72,7 @@ class ResourceFoldingBuilder : FoldingBuilderEx() {
} }
override fun buildFoldRegions(root: PsiElement, document: Document, quick: Boolean): Array<FoldingDescriptor> { override fun buildFoldRegions(root: PsiElement, document: Document, quick: Boolean): Array<FoldingDescriptor> {
if (root !is KtFile || quick && !UNIT_TEST_MODE || !isFoldingEnabled) { if (root !is KtFile || quick && !UNIT_TEST_MODE || !isFoldingEnabled || AndroidFacet.getInstance(root) == null) {
return emptyArray() return emptyArray()
} }