mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[groovy] make place in BaseGroovyResolveResult non-null
This commit is contained in:
+3
-4
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -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)
|
||||
|
||||
+1
-1
@@ -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>() {
|
||||
|
||||
Reference in New Issue
Block a user