From 3366d0298feb5630af51e25dcacc868c0343807b Mon Sep 17 00:00:00 2001
From: Daniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Date: Wed, 7 Nov 2018 15:29:08 +0300
Subject: [PATCH] [groovy] make place in BaseGroovyResolveResult non-null

---
 .../plugins/groovy/lang/resolve/BaseGroovyResolveResult.kt | 7 +++----
 .../plugins/groovy/lang/resolve/ClassResolveResult.kt      | 4 ++--
 .../groovy/lang/resolve/processors/ClassProcessor.kt       | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/BaseGroovyResolveResult.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/BaseGroovyResolveResult.kt
index 8d18bbcc357e..e7fd1b5c5641 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/BaseGroovyResolveResult.kt
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/BaseGroovyResolveResult.kt
@@ -10,13 +10,13 @@ import org.jetbrains.plugins.groovy.lang.resolve.processors.ClassHint
 
 open class BaseGroovyResolveResult<out T : PsiElement>(
   element: T,
-  private val place: PsiElement?,
+  private val place: PsiElement,
   private val resolveContext: PsiElement? = null,
   private val substitutor: PsiSubstitutor = PsiSubstitutor.EMPTY,
   private val spreadState: SpreadState? = null
 ) : ElementResolveResult<T>(element) {
 
-  constructor(element: T, place: PsiElement?, state: ResolveState) : this(
+  constructor(element: T, place: PsiElement, state: ResolveState) : this(
     element,
     place,
     resolveContext = state[ClassHint.RESOLVE_CONTEXT],
@@ -25,7 +25,7 @@ open class BaseGroovyResolveResult<out T : PsiElement>(
   )
 
   private val accessible by lazy(LazyThreadSafetyMode.PUBLICATION) {
-    element !is PsiMember || place == null || PsiUtil.isAccessible(place, element)
+    element !is PsiMember || PsiUtil.isAccessible(place, element)
   }
 
   override fun isAccessible(): Boolean = accessible
@@ -33,7 +33,6 @@ open class BaseGroovyResolveResult<out T : PsiElement>(
   private val staticsOk by lazy(LazyThreadSafetyMode.PUBLICATION) {
     resolveContext is GrImportStatement ||
     element !is PsiModifierListOwner ||
-    place == null ||
     GrStaticChecker.isStaticsOK(element, place, resolveContext, false)
   }
 
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ClassResolveResult.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ClassResolveResult.kt
index c031cc7cbd26..f1a000757546 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ClassResolveResult.kt
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ClassResolveResult.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.plugins.groovy.lang.resolve
 
 import com.intellij.psi.PsiClass
@@ -7,7 +7,7 @@ import com.intellij.psi.PsiSubstitutor
 
 class ClassResolveResult(
   element: PsiClass,
-  place: PsiElement?,
+  place: PsiElement,
   resolveContext: PsiElement?,
   substitutor: PsiSubstitutor
 ) : BaseGroovyResolveResult<PsiClass>(element, place, resolveContext, substitutor)
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ClassProcessor.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ClassProcessor.kt
index 095021a3a59e..2f76b62f75aa 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ClassProcessor.kt
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ClassProcessor.kt
@@ -9,7 +9,7 @@ import org.jetbrains.plugins.groovy.lang.resolve.imports.importedNameKey
 
 internal open class ClassProcessor(
   private val name: String,
-  private val place: PsiElement?,
+  private val place: PsiElement,
   private val typeArguments: Array<out PsiType> = PsiType.EMPTY_ARRAY,
   annotationResolve: Boolean = false
 ) : FindFirstProcessor<ClassResolveResult>() {