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

Java Uast: Support try-with-resources

Browse Source
This commit is contained in:
Yan Zhulanow
2016-03-22 16:41:11 +03:00
parent 9d34df2475
commit 3258ebae39
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-common/src/org/jetbrains/uast/controlStructures/UTryExpression.kt
+1
View File
@@ -16,6 +16,7 @@
package org.jetbrains.uast package org.jetbrains.uast
interface UTryExpression : UExpression { interface UTryExpression : UExpression {
val resources: List<UElement>?
val tryClause: UExpression val tryClause: UExpression
val catchClauses: List<UCatchClause> val catchClauses: List<UCatchClause>
val finallyClause: UExpression? val finallyClause: UExpression?
plugins/uast-java/src/org/jetbrains/uast/java/JavaUastLanguagePlugin.kt
+1
View File
@@ -56,6 +56,7 @@ internal object JavaConverter : UastConverter {
is PsiVariable -> convert(element, parent) is PsiVariable -> convert(element, parent)
is PsiClassInitializer -> convert(element, parent) is PsiClassInitializer -> convert(element, parent)
is PsiAnnotation -> convert(element, parent) is PsiAnnotation -> convert(element, parent)
is PsiResourceExpression -> convert(element.expression, parent)
is PsiExpression -> convert(element, parent) is PsiExpression -> convert(element, parent)
is PsiStatement -> convert(element, parent) is PsiStatement -> convert(element, parent)
is PsiIdentifier -> JavaUSimpleReferenceExpression(element, element.text, parent) is PsiIdentifier -> JavaUSimpleReferenceExpression(element, element.text, parent)
plugins/uast-java/src/org/jetbrains/uast/java/controlStructures/JavaUTryExpression.kt
+6 -4
View File
@@ -17,10 +17,7 @@ package org.jetbrains.uast.java
import com.intellij.psi.PsiCatchSection import com.intellij.psi.PsiCatchSection
import com.intellij.psi.PsiTryStatement import com.intellij.psi.PsiTryStatement
import org.jetbrains.uast.NoEvaluate import org.jetbrains.uast.*
import org.jetbrains.uast.UCatchClause
import org.jetbrains.uast.UElement
import org.jetbrains.uast.UTryExpression
import org.jetbrains.uast.psi.PsiElementBacked import org.jetbrains.uast.psi.PsiElementBacked
class JavaUTryExpression( class JavaUTryExpression(
@@ -30,6 +27,11 @@ class JavaUTryExpression(
override val tryClause by lz { JavaConverter.convertOrEmpty(psi.tryBlock, this) } override val tryClause by lz { JavaConverter.convertOrEmpty(psi.tryBlock, this) }
override val catchClauses by lz { psi.catchSections.map { JavaUCatchClause(it, this) } } override val catchClauses by lz { psi.catchSections.map { JavaUCatchClause(it, this) } }
override val finallyClause by lz { psi.finallyBlock?.let { JavaConverter.convert(it, this) } } override val finallyClause by lz { psi.finallyBlock?.let { JavaConverter.convert(it, this) } }
override val resources by lz {
val vars = psi.resourceList ?: return@lz null
val resources = vars.map { JavaConverter.convert(it, this) ?: UDeclarationNotResolved }
if (resources.isEmpty()) null else resources
}
} }
class JavaUCatchClause( class JavaUCatchClause(
plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUTryExpression.kt
+2
View File
@@ -29,4 +29,6 @@ class KotlinUTryExpression(
override val tryClause by lz { KotlinConverter.convert(psi.tryBlock, this) } override val tryClause by lz { KotlinConverter.convert(psi.tryBlock, this) }
override val catchClauses by lz { psi.catchClauses.map { KotlinUCatchClause(it, this) } } override val catchClauses by lz { psi.catchClauses.map { KotlinUCatchClause(it, this) } }
override val finallyClause by lz { psi.finallyBlock?.finalExpression?.let { KotlinConverter.convert(it, this) } } override val finallyClause by lz { psi.finallyBlock?.finalExpression?.let { KotlinConverter.convert(it, this) } }
override val resources: List<UElement>?
get() = null
} }