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

Minor code improvements

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-19 21:57:14 +03:00
parent 8010c0f09d
commit 3e437adbb4
2 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt
+9 -3
View File
@@ -30,12 +30,12 @@ import java.io.File
import org.jetbrains.jet.lang.psi.JetBlockExpression
import org.junit.Assert
import org.jetbrains.jet.lang.types.JetType
import org.jetbrains.jet.lang.psi.psiUtil.parents
import org.jetbrains.jet.renderer.DescriptorRenderer
import org.jetbrains.jet.lang.descriptors.VariableDescriptor
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression
import org.jetbrains.jet.lang.psi.psiUtil.getReceiverExpression
import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade
import org.jetbrains.jet.lang.psi.psiUtil.parents
public abstract class AbstractPartialBodyResolveTest : JetLightCodeInsightFixtureTestCase() {
override fun getTestDataPath() = JetTestCaseBuilder.getHomeDirectory()
@@ -76,7 +76,13 @@ public abstract class AbstractPartialBodyResolveTest : JetLightCodeInsightFixtur
Assert.assertEquals(target2.presentation(type2), target1.presentation(type1))
}
private fun doResolve(refExpression: JetSimpleNameExpression, bindingContext: BindingContext): Triple<DeclarationDescriptor?, JetType?, Collection<JetExpression>> {
private data class ResolveData(
val target: DeclarationDescriptor?,
val type: JetType?,
val processedStatements: Collection<JetExpression>
)
private fun doResolve(refExpression: JetSimpleNameExpression, bindingContext: BindingContext): ResolveData {
val target = bindingContext[BindingContext.REFERENCE_TARGET, refExpression]
val processedStatements = bindingContext.getSliceContents(BindingContext.PROCESSED)
@@ -93,7 +99,7 @@ public abstract class AbstractPartialBodyResolveTest : JetLightCodeInsightFixtur
}
val type = bindingContext[BindingContext.EXPRESSION_TYPE, expressionWithType]
return Triple(target, type, processedStatements)
return ResolveData(target, type, processedStatements)
}
private fun DeclarationDescriptor?.presentation(type: JetType?): String {