From 4f3e3610a0cbcb041a439f19fdba5ed0dcbd1f0f Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 18 Sep 2015 23:55:53 +0300 Subject: [PATCH] NPE fixed inside three implementations of LexicalScope.printStructure --- .../org/jetbrains/kotlin/resolve/scopes/LexicalChainedScope.kt | 2 +- .../src/org/jetbrains/kotlin/resolve/scopes/LexicalScopeImpl.kt | 2 +- .../org/jetbrains/kotlin/resolve/scopes/LexicalWritableScope.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalChainedScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalChainedScope.kt index 4cc0bda886f..4f73900d639 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalChainedScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalChainedScope.kt @@ -48,7 +48,7 @@ public class LexicalChainedScope( override fun printStructure(p: Printer) { p.println(javaClass.simpleName, ": ", debugName, "; for descriptor: ", ownerDescriptor.name, - " with implicitReceiver: ", implicitReceiver?.value, " {") + " with implicitReceiver: ", implicitReceiver?.value ?: "NONE", " {") p.pushIndent() for (scope in scopeChain) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalScopeImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalScopeImpl.kt index c2e96d2cbd7..77f9a8d90c5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalScopeImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalScopeImpl.kt @@ -56,7 +56,7 @@ public class LexicalScopeImpl @JvmOverloads constructor( override fun printStructure(p: Printer) { p.println(javaClass.simpleName, ": ", debugName, "; for descriptor: ", ownerDescriptor.name, - " with implicitReceiver: ", implicitReceiver?.value, " {") + " with implicitReceiver: ", implicitReceiver?.value ?: "NONE", " {") p.pushIndent() p.print("parent = ") diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalWritableScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalWritableScope.kt index 1f0b78f817b..f75fb912342 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalWritableScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalWritableScope.kt @@ -124,7 +124,7 @@ class LexicalWritableScope( override fun printStructure(p: Printer) { p.println(javaClass.simpleName, ": ", debugName, "; for descriptor: ", ownerDescriptor.name, - " with implicitReceiver: ", implicitReceiver?.value, " {") + " with implicitReceiver: ", implicitReceiver?.value ?: "NONE", " {") p.pushIndent() p.print("parent = ")