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

Renamed enum members

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-21 15:23:55 +03:00
parent d334011d5d
commit ea3da6cbe6
1 changed files with 8 additions and 8 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
+8 -8
View File
@@ -42,7 +42,7 @@ class PartialBodyResolveFilter(
private val nothingFunctionNames = HashSet(probablyNothingCallableNames.functionNames()) private val nothingFunctionNames = HashSet(probablyNothingCallableNames.functionNames())
private val nothingPropertyNames = probablyNothingCallableNames.propertyNames() private val nothingPropertyNames = probablyNothingCallableNames.propertyNames()
override val filter: ((JetElement) -> Boolean)? = { it is JetExpression && statementTree.statementMark(it) != MarkLevel.NONE } override val filter: ((JetElement) -> Boolean)? = { it is JetExpression && statementTree.statementMark(it) != MarkLevel.SKIP }
;{ ;{
assert(declaration.isAncestor(elementToResolve)) assert(declaration.isAncestor(elementToResolve))
@@ -79,7 +79,7 @@ class PartialBodyResolveFilter(
val startStatement = block.getLastChild().siblings(forward = false) val startStatement = block.getLastChild().siblings(forward = false)
.filterIsInstance<JetExpression>() .filterIsInstance<JetExpression>()
.first { statementTree.statementMark(it) > MarkLevel.RESOLVE_STATEMENT } .first { statementTree.statementMark(it) > MarkLevel.TAKE }
for (statement in startStatement.siblings(forward = false)) { for (statement in startStatement.siblings(forward = false)) {
if (statement !is JetExpression) continue if (statement !is JetExpression) continue
@@ -121,7 +121,7 @@ class PartialBodyResolveFilter(
} }
val level = statementTree.statementMark(statement) val level = statementTree.statementMark(statement)
if (level > MarkLevel.RESOLVE_STATEMENT) { if (level > MarkLevel.TAKE) {
for (nestedBlock in statementTree.blocks(statement)) { for (nestedBlock in statementTree.blocks(statement)) {
val childFilter = processBlock(nestedBlock) val childFilter = processBlock(nestedBlock)
nameFilter.addNames(childFilter) nameFilter.addNames(childFilter)
@@ -478,8 +478,8 @@ class PartialBodyResolveFilter(
} }
private enum class MarkLevel { private enum class MarkLevel {
NONE SKIP
RESOLVE_STATEMENT TAKE
NEED_REFERENCE_RESOLVE NEED_REFERENCE_RESOLVE
NEED_COMPLETION NEED_COMPLETION
} }
@@ -523,7 +523,7 @@ class PartialBodyResolveFilter(
statementMarks[statement] = level statementMarks[statement] = level
val block = statement.getParent() as JetBlockExpression val block = statement.getParent() as JetBlockExpression
val currentBlockLevel = blockLevels[block] ?: MarkLevel.NONE val currentBlockLevel = blockLevels[block] ?: MarkLevel.SKIP
if (currentBlockLevel < level) { if (currentBlockLevel < level) {
blockLevels[block] = level blockLevels[block] = level
} }
@@ -531,10 +531,10 @@ class PartialBodyResolveFilter(
} }
fun statementMark(statement: JetExpression): MarkLevel fun statementMark(statement: JetExpression): MarkLevel
= statementMarks[statement] ?: MarkLevel.NONE = statementMarks[statement] ?: MarkLevel.SKIP
fun hasMarks(block: JetBlockExpression, minLevel: MarkLevel): Boolean { fun hasMarks(block: JetBlockExpression, minLevel: MarkLevel): Boolean {
val level = blockLevels[block] ?: return minLevel == MarkLevel.NONE val level = blockLevels[block] ?: return minLevel == MarkLevel.SKIP
return level >= minLevel return level >= minLevel
} }
} }