From 0adf1d210f13eb420ef8ee89fae5b48e3eeeaf27 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 18 Aug 2017 15:32:03 +0300 Subject: [PATCH] Make KtPureElement.getParent() nullable #KT-19760 Fixed The reason is KtFile.getParent() is a containing directory which is nullable --- .../frontend/src/org/jetbrains/kotlin/psi/KtPureElement.java | 1 - .../src/org/jetbrains/kotlin/types/expressions/LabelResolver.kt | 1 - 2 files changed, 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPureElement.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPureElement.java index 04685cdae72..1d81ecf3e95 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPureElement.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPureElement.java @@ -34,7 +34,6 @@ public interface KtPureElement { /** * Returns parent source element. */ - @NotNull PsiElement getParent(); @NotNull diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.kt index 57409b02df8..b8d4baab8e8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.kt @@ -90,7 +90,6 @@ object LabelResolver { if (parent is KtValueArgument) { // f ({}) or f(p = {}) or f (fun () {}) - // NB: parent of KtElement is really nullable!!! val argList = parent.parent ?: return null val call = argList.parent if (call is KtCallExpression) {