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

Partial body resolve works for local Nothing functions + does not go inside local functions and classes

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-19 20:03:31 +03:00
parent b22233d378
commit 8010c0f09d
15 changed files with 118 additions and 33 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
+24 -6
View File
@@ -26,6 +26,9 @@ import java.util.HashMap
import com.intellij.psi.PsiElement
import org.jetbrains.jet.JetNodeTypes
import org.jetbrains.jet.lang.psi.psiUtil.isAncestor
import org.jetbrains.jet.lang.psi.psiUtil.isProbablyNothing
//TODO: do resolve anonymous object's body
class PartialBodyResolveFilter(
elementToResolve: JetElement,
@@ -35,12 +38,27 @@ class PartialBodyResolveFilter(
private val statementsToResolve = HashSet<JetExpression>()
private val processedBlocks = HashSet<JetBlockExpression>()
private val nothingFunctionNames = probablyNothingCallableNamesService.functionNames()
private val nothingFunctionNames = HashSet(probablyNothingCallableNamesService.functionNames())
private val nothingPropertyNames = probablyNothingCallableNamesService.propertyNames()
;{
assert(body.isAncestor(elementToResolve, strict = false))
body.accept(object : JetVisitorVoid(){
override fun visitNamedFunction(function: JetNamedFunction) {
super.visitNamedFunction(function)
if (function.getTypeReference().isProbablyNothing()) {
nothingFunctionNames.add(function.getName())
}
}
override fun visitElement(element: PsiElement) {
element.acceptChildren(this)
}
})
addStatementsToResolve(elementToResolve)
}
@@ -54,8 +72,7 @@ class PartialBodyResolveFilter(
private fun addStatementsToResolve(element: JetElement) {
if (element == body) return
val parent = element.getParent() as? JetElement
?: return
val parent = element.getParent() as? JetElement ?: return
if (parent is JetBlockExpression) {
processBlock(parent)
@@ -67,6 +84,7 @@ class PartialBodyResolveFilter(
for (statement in element.siblings(forward = false, withItself = false)) {
if (statement !is JetExpression) continue
if (statement is JetClassBody) continue
val smartCastPlaces = potentialSmartCastPlaces(statement)
if (!smartCastPlaces.isEmpty()) {
@@ -312,15 +330,15 @@ class PartialBodyResolveFilter(
return result
}
private abstract class ControlFlowVisitor : JetVisitorVoid() {
private inner abstract class ControlFlowVisitor : JetVisitorVoid() {
override fun visitJetElement(element: JetElement) {
if (element.noControlFlowInside()) return
element.acceptChildren(this)
}
private fun JetElement.noControlFlowInside() = this is JetFunction || this is JetClass || this is JetClassBody
}
private fun JetElement.noControlFlowInside() = this is JetFunction || this is JetClass || this is JetClassBody
private fun MutableSet<JetExpression>.addStatementsForPlaces(thisStatement: JetExpression, places: Collection<JetExpression>) {
@PlacesLoop
for (place in places) {