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

Fix android synthetic properties compiler plugin tests

Browse Source
This commit is contained in:
Yan Zhulanow
2015-08-20 21:28:46 +03:00
parent 0f5d87957d
commit 0339bc55df
52 changed files with 315 additions and 886 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/CliSyntheticFileGenerator.kt
+1
View File
@@ -25,6 +25,7 @@ import com.intellij.psi.impl.PsiElementFinderImpl
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.android.synthetic.AndroidXmlHandler
import org.jetbrains.kotlin.android.synthetic.parseAndroidResource
import org.jetbrains.kotlin.load.java.JavaClassFinder
import org.jetbrains.kotlin.psi.JetFile
public open class CliSyntheticFileGenerator(
plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/SyntheticFileGenerator.kt
+1 -1
View File
@@ -45,7 +45,7 @@ public abstract class SyntheticFileGenerator(protected val project: Project) {
public abstract fun getSyntheticFiles(): List<JetFile>
protected fun generateSyntheticFiles(generateCommonFiles: Boolean, supportV4: Boolean): List<AndroidSyntheticFile> {
protected open fun generateSyntheticFiles(generateCommonFiles: Boolean, supportV4: Boolean): List<AndroidSyntheticFile> {
val commonFiles = if (generateCommonFiles) generateCommonFiles(supportV4) else listOf()
return layoutXmlFileManager.getLayoutXmlFiles().flatMap { entry ->