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

181: compilation fix: KotlinCallerChooser and KotlinAwareMoveClassesOrPackagesToNewDirectoryDialog

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2018-01-26 13:21:30 +03:00
committed by Nikolay Krasko
parent 26a0dbe910
commit ffe33844b7
4 changed files with 161 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/tests/AbstractKotlinRenderLogTest.kt.181
+2 -5
View File
@@ -7,10 +7,7 @@ import com.intellij.psi.impl.source.tree.LeafPsiElement
import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.utils.addToStdlib.assertedCast
import org.jetbrains.uast.JvmDeclarationUElement
import org.jetbrains.uast.UDeclaration
import org.jetbrains.uast.UElement
import org.jetbrains.uast.UFile
import org.jetbrains.uast.*
import org.jetbrains.uast.kotlin.KOTLIN_CACHED_UELEMENT_KEY
import org.jetbrains.uast.kotlin.KotlinUastLanguagePlugin
import org.jetbrains.uast.test.common.RenderLogTestBase
@@ -104,7 +101,7 @@ abstract class AbstractKotlinRenderLogTest : AbstractKotlinUastTest(), RenderLog
accept(object : UastVisitor {
override fun visitElement(node: UElement): Boolean {
if (node is UDeclaration) {// visitDeclaration hasn't come yet
if (node is UAnchorOwner) {
node.uastAnchor?.let { visitElement(it) }
}
plugins/uast-kotlin/tests/KotlinUastApiTest.kt.181
+3 -2
View File
@@ -219,9 +219,10 @@ class KotlinUastApiTest : AbstractKotlinUastTest() {
@Test
fun testSimpleAnnotated() {
doTest("SimpleAnnotated") { _, file ->
file.findElementByTextFromPsi<UField>("@SinceKotlin(\"1.0\")\n val property: String = \"Mary\"").let { field ->
file.findElementByTextFromPsi<UField>("@kotlin.SinceKotlin(\"1.0\")\n val property: String = \"Mary\"").let { field ->
val annotation = field.annotations.assertedFind("kotlin.SinceKotlin") { it.qualifiedName }
Assert.assertEquals(annotation.findDeclaredAttributeValue("version")?.evaluateString(), "1.0")
Assert.assertEquals("1.0", annotation.findDeclaredAttributeValue("version")?.evaluateString())
Assert.assertEquals("SinceKotlin", annotation.cast<UAnchorOwner>().uastAnchor?.sourcePsi?.text)
}
}
}