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

Added assert + removed qualified names

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-21 18:14:08 +03:00
parent bd8eaeedaa
commit c5afc219b9
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.kt
+1 -1
View File
@@ -258,7 +258,7 @@ private fun generatorForBodyResolve() =
parameter(javaClass<BindingTrace>()) parameter(javaClass<BindingTrace>())
parameter(javaClass<ModuleDescriptor>(), useAsContext = true) parameter(javaClass<ModuleDescriptor>(), useAsContext = true)
parameter(javaClass<AdditionalCheckerProvider>()) parameter(javaClass<AdditionalCheckerProvider>())
parameter(javaClass<org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider>()) parameter(javaClass<PartialBodyResolveProvider>())
publicField(javaClass<BodyResolver>()) publicField(javaClass<BodyResolver>())
} }
idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt
+4 -1
View File
@@ -28,6 +28,7 @@ import org.jetbrains.jet.JetNodeTypes
import org.jetbrains.jet.lang.psi.psiUtil.isProbablyNothing import org.jetbrains.jet.lang.psi.psiUtil.isProbablyNothing
import org.jetbrains.jet.utils.addToStdlib.firstIsInstanceOrNull import org.jetbrains.jet.utils.addToStdlib.firstIsInstanceOrNull
import org.jetbrains.jet.lang.psi.psiUtil.isAncestor import org.jetbrains.jet.lang.psi.psiUtil.isAncestor
import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider
//TODO: do resolve anonymous object's body //TODO: do resolve anonymous object's body
@@ -35,7 +36,7 @@ class PartialBodyResolveFilter(
elementToResolve: JetElement, elementToResolve: JetElement,
private val declaration: JetDeclaration, private val declaration: JetDeclaration,
probablyNothingCallableNames: ProbablyNothingCallableNames probablyNothingCallableNames: ProbablyNothingCallableNames
) : org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider() { ) : PartialBodyResolveProvider() {
private val statementMarks = StatementMarks() private val statementMarks = StatementMarks()
@@ -46,6 +47,8 @@ class PartialBodyResolveFilter(
;{ ;{
assert(declaration.isAncestor(elementToResolve)) assert(declaration.isAncestor(elementToResolve))
assert(!JetPsiUtil.isLocal(declaration),
"Should never be invoked on local declaration otherwise we may miss some local declarations with type Nothing")
declaration.accept(object : JetVisitorVoid() { declaration.accept(object : JetVisitorVoid() {
override fun visitNamedFunction(function: JetNamedFunction) { override fun visitNamedFunction(function: JetNamedFunction) {