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

Partial body resolve filter: more correct lambda resolve for return

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-20 13:10:33 +03:00
parent 59cc441fc5
commit 4503adb7fc
4 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt
+19 -18
View File
@@ -83,7 +83,8 @@ class PartialBodyResolveFilter(
val smartCastPlaces = potentialSmartCastPlaces(statement)
if (!smartCastPlaces.isEmpty()) {
addStatementToResolve(statement)
statementsToResolve.addStatementsForPlaces(smartCastPlaces.values().flatMap { it })
//TODO: do we really need correct resolve for ALL smart cast places?
addStatementsToResolveForPlaces(smartCastPlaces.values().flatMap { it })
}
else if (statement is JetDeclaration) {
addStatementToResolve(statement)
@@ -94,25 +95,25 @@ class PartialBodyResolveFilter(
addStatementsToResolve(parent)
}
private fun addStatementToResolve(statement: JetExpression) {
private fun addStatementToResolve(statement: JetExpression): Boolean {
assert(statement.getParent() is JetBlockExpression)
if (statementsToResolve.add(statement)) {
// search for code blocks inside statement and make sure its values will be resolved
statement.accept(object : JetVisitorVoid(){
override fun visitBlockExpression(expression: JetBlockExpression) {
if (isValueNeeded(expression)) {
val value = expression.lastStatement()
if (value != null) {
addStatementsToResolve(value)
}
if (!statementsToResolve.add(statement)) return false
// search for code blocks inside statement and make sure its values will be resolved
statement.accept(object : JetVisitorVoid(){
override fun visitBlockExpression(expression: JetBlockExpression) {
if (isValueNeeded(expression)) {
val value = expression.lastStatement()
if (value != null) {
addStatementsToResolve(value)
}
}
}
override fun visitJetElement(element: JetElement) {
element.acceptChildren(this)
}
})
}
override fun visitJetElement(element: JetElement) {
element.acceptChildren(this)
}
})
return true
}
/**
@@ -351,11 +352,11 @@ class PartialBodyResolveFilter(
private fun JetElement.noControlFlowInside() = this is JetFunction || this is JetClass || this is JetClassBody
private fun MutableSet<JetExpression>.addStatementsForPlaces(places: Collection<JetExpression>) {
private fun addStatementsToResolveForPlaces(places: Collection<JetExpression>) {
for (place in places) {
var parent: PsiElement = place
while (true) {
if (parent.isStatement() && !add(parent as JetExpression)) break
if (parent.isStatement() && !addStatementToResolve(parent as JetExpression)) break
parent = parent.getParent()
}
}