MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[groovy] make properties private

Browse Source
This commit is contained in:
Daniil Ovchinnikov
2018-10-10 16:40:50 +03:00
parent b6fc51e780
commit 14be9407fb
6 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/inference/ClosureConstraint.kt
+2 -1
View File
@@ -14,7 +14,8 @@ import org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames
import org.jetbrains.plugins.groovy.lang.sam.findSingleAbstractMethod
import org.jetbrains.plugins.groovy.lang.sam.isSamConversionAllowed
class ClosureConstraint(val closure: GrClosableBlock, val leftType: PsiType) : ConstraintFormula {
class ClosureConstraint(private val closure: GrClosableBlock, private val leftType: PsiType) : ConstraintFormula {
override fun reduce(session: InferenceSession, constraints: MutableList<ConstraintFormula>): Boolean {
if ((session as GroovyInferenceSession).skipClosureBlock || session.closureSkipList.contains(findCall(closure))) {
//TODO:add explicit typed closure constraints
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/inference/ExpressionConstraint.kt
+2 -1
View File
@@ -10,7 +10,8 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpres
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrMethodCall
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression
class ExpressionConstraint(val expression: GrExpression, val leftType: PsiType?) : ConstraintFormula {
class ExpressionConstraint(private val expression: GrExpression, private val leftType: PsiType?) : ConstraintFormula {
override fun reduce(session: InferenceSession, constraints: MutableList<ConstraintFormula>): Boolean {
when (expression) {
is GrMethodCall -> {
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/inference/GroovyInferenceSessionBuilder.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefini
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod
import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil
class GroovyInferenceSessionBuilder(val ref: GrReferenceExpression, val candidate: MethodCandidate) {
class GroovyInferenceSessionBuilder(private val ref: GrReferenceExpression, private val candidate: MethodCandidate) {
private var closureSkipList = mutableListOf<GrMethodCall>()
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/inference/MethodCallConstraint.kt
+1 -1
View File
@@ -6,7 +6,7 @@ import com.intellij.psi.impl.source.resolve.graphInference.InferenceSession
import com.intellij.psi.impl.source.resolve.graphInference.constraints.ConstraintFormula
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression
class MethodCallConstraint(private val callRef: GrReferenceExpression, val candidate: MethodCandidate) : ConstraintFormula {
class MethodCallConstraint(private val callRef: GrReferenceExpression, private val candidate: MethodCandidate) : ConstraintFormula {
override fun reduce(session: InferenceSession, constraints: MutableList<ConstraintFormula>): Boolean {
processArguments(constraints)
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/inference/MethodCandidate.kt
+2 -2
View File
@@ -17,8 +17,8 @@ import java.util.*
class MethodCandidate(val method: PsiMethod,
val siteSubstitutor: PsiSubstitutor,
val arguments: List<Argument>,
val context: GroovyPsiElement) {
private val arguments: List<Argument>,
private val context: GroovyPsiElement) {
val argumentMapping: Map<Argument, Pair<PsiParameter, PsiType?>> by lazy {
mapArguments(typeComputer)
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/inference/TypeConstraint.kt
+2 -1
View File
@@ -13,7 +13,8 @@ import org.jetbrains.plugins.groovy.lang.psi.impl.GrMapType
import org.jetbrains.plugins.groovy.lang.psi.impl.GrTupleType
import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.TypesUtil
class TypeConstraint(val leftType: PsiType, private val rightType: PsiType?, val context: PsiElement) : ConstraintFormula {
class TypeConstraint(private val leftType: PsiType, private val rightType: PsiType?, private val context: PsiElement) : ConstraintFormula {
override fun reduce(session: InferenceSession, constraints: MutableList<ConstraintFormula>): Boolean {
if (session !is GroovyInferenceSession) return true
var argType = rightType ?: PsiType.NULL