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

Fixed NPEs

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-28 13:30:27 +03:00
parent 9283daccb6
commit db6bf787fc
1 changed files with 3 additions and 3 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
+3 -3
View File
@@ -286,7 +286,7 @@ class PartialBodyResolveFilter(
} }
override fun visitIfExpression(expression: JetIfExpression) { override fun visitIfExpression(expression: JetIfExpression) {
expression.getCondition().accept(this) expression.getCondition()?.accept(this)
val thenBranch = expression.getThen() val thenBranch = expression.getThen()
val elseBranch = expression.getElse() val elseBranch = expression.getElse()
@@ -308,7 +308,7 @@ class PartialBodyResolveFilter(
} }
override fun visitWhileExpression(loop: JetWhileExpression) { override fun visitWhileExpression(loop: JetWhileExpression) {
val condition = loop.getCondition() val condition = loop.getCondition() ?: return
if (condition.isTrueConstant()) { if (condition.isTrueConstant()) {
insideLoopLevel++ insideLoopLevel++
loop.getBody()?.accept(this) loop.getBody()?.accept(this)
@@ -316,7 +316,7 @@ class PartialBodyResolveFilter(
} }
else { else {
// do not make sense to search exits inside while-loop as not necessary enter it at all // do not make sense to search exits inside while-loop as not necessary enter it at all
condition?.accept(this) condition.accept(this)
} }
} }