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

New J2K: add better support of implicit functional interfaces

Browse Source 
#KT-32702 fixed
#KT-19327 fixed
This commit is contained in:
Ilya Kirillov
2019-07-17 17:13:33 +03:00
parent 96ca4712a0
commit f79b282c60
34 changed files with 425 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt
+6 -4
View File
@@ -55,18 +55,20 @@ abstract class AbstractJavaToKotlinConverterTest : KotlinLightCodeInsightFixture
super.tearDown()
}
private fun addFile(fileName: String, dirName: String) {
protected fun addFile(fileName: String, dirName: String? = null) {
addFile(File("j2k/testData/$fileName"), dirName)
}
protected fun addFile(file: File, dirName: String): VirtualFile {
protected fun addFile(file: File, dirName: String?): VirtualFile {
return addFile(FileUtil.loadFile(file, true), file.name, dirName)
}
protected fun addFile(text: String, fileName: String, dirName: String): VirtualFile {
protected fun addFile(text: String, fileName: String, dirName: String?): VirtualFile {
return runWriteAction {
val root = LightPlatformTestCase.getSourceRoot()!!
val virtualDir = root.findChild(dirName) ?: root.createChildDirectory(null, dirName)
val virtualDir = dirName?.let {
root.findChild(it) ?: root.createChildDirectory(null, it)
} ?: root
val virtualFile = virtualDir.createChildData(null, fileName)
virtualFile.getOutputStream(null)!!.writer().use { it.write(text) }
virtualFile