From 51d396982254c6fb5b27b45376ad49137d52c9b6 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 16 Aug 2017 12:26:01 +0700 Subject: [PATCH] Do not run resolution processors for inapplicable statics --- .../org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt index 21139f9557c..49f74d3ac5d 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt @@ -143,7 +143,7 @@ class TowerResolver { for (scope in lexicalScope.parentsWithSelf) { if (scope is LexicalScope) { // statics - if (!scope.kind.withLocalDescriptors) { + if (!scope.kind.withLocalDescriptors && scope.mayFitForName(name, location)) { TowerData.TowerLevel(ScopeBasedTowerLevel(this, scope)).process()?.let { return it } }