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] rename VariableProcessor to LocalVariableProcessor

Browse Source 
- move it to proper package;
- make it don't provide DynamicMembersHint.
This commit is contained in:
Daniil Ovchinnikov
2017-10-09 12:04:10 +03:00
parent 27c6765b14
commit a152ea1932
2 changed files with 16 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GrReferenceResolveRunner.kt
+4 -17
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// 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.
package org.jetbrains.plugins.groovy.lang.resolve
import com.intellij.psi.*
@@ -40,6 +26,7 @@ import org.jetbrains.plugins.groovy.lang.resolve.ResolveUtil.canResolveToMethod
import org.jetbrains.plugins.groovy.lang.resolve.ResolveUtil.isDefinitelyKeyOfMap
import org.jetbrains.plugins.groovy.lang.resolve.processors.ClassHint
import org.jetbrains.plugins.groovy.lang.resolve.processors.GroovyResolverProcessorBuilder
import org.jetbrains.plugins.groovy.lang.resolve.processors.LocalVariableProcessor
private class GrReferenceResolveRunner(val place: GrReferenceExpression, val processor: PsiScopeProcessor) {
@@ -216,9 +203,9 @@ private fun GrReferenceExpression.resolveLocalVariable(): GroovyResolveResult? {
if (isQualified) return null
val name = referenceName ?: return null
val state = ResolveState.initial()
val processor = VariableProcessor(name)
val processor = LocalVariableProcessor(name)
treeWalkUp(processor, state)
return processor.result
return processor.resolveResult
}
private fun GrReferenceElement<*>.getQualifiedReferenceName(): String? {
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/VariableProcessor.kt → plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/LocalVariableProcessor.kt
+12 -27
View File
@@ -1,19 +1,5 @@
/*
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.plugins.groovy.lang.resolve
// 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.
package org.jetbrains.plugins.groovy.lang.resolve.processors
import com.intellij.openapi.util.Key
import com.intellij.psi.PsiElement
@@ -30,31 +16,30 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMe
import org.jetbrains.plugins.groovy.lang.psi.impl.GroovyResolveResultImpl
import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GrBindingVariable
import org.jetbrains.plugins.groovy.lang.resolve.ResolveUtil.DECLARATION_SCOPE_PASSED
import org.jetbrains.plugins.groovy.lang.resolve.processors.DynamicMembersHint
class VariableProcessor(private val myName: String) : PsiScopeProcessor, NameHint, ElementClassHint, DynamicMembersHint {
class LocalVariableProcessor(private val name: String) : PsiScopeProcessor, NameHint, ElementClassHint {
private var myStop: Boolean = false
private var myResult: GroovyResolveResult? = null
val result: GroovyResolveResult? get() = myResult
private var stopped: Boolean = false
var resolveResult: GroovyResolveResult? = null
private set
override fun <T : Any?> getHint(hintKey: Key<T>): T? {
if (hintKey == NameHint.KEY || hintKey == ElementClassHint.KEY || hintKey == DynamicMembersHint.KEY) {
if (hintKey == NameHint.KEY || hintKey == ElementClassHint.KEY) {
@Suppress("UNCHECKED_CAST")
return this as? T
}
return null
}
override fun getName(state: ResolveState) = myName
override fun getName(state: ResolveState) = name
override fun shouldProcess(kind: ElementClassHint.DeclarationKind?) = !myStop && kind == VARIABLE
override fun shouldProcess(kind: ElementClassHint.DeclarationKind?) = !stopped && kind == VARIABLE
override fun execute(element: PsiElement, state: ResolveState): Boolean {
if (myStop) return false
if (stopped) return false
assert(element !is GrBindingVariable)
if (element is GrVariable && element !is GrField) {
myResult = GroovyResolveResultImpl(element, true)
resolveResult = GroovyResolveResultImpl(element, true)
return false
}
else {
@@ -67,6 +52,6 @@ class VariableProcessor(private val myName: String) : PsiScopeProcessor, NameHin
*/
override fun handleEvent(event: PsiScopeProcessor.Event, associated: Any?) {
if (event != DECLARATION_SCOPE_PASSED) return
if (associated is GrMember || associated is GroovyFile) myStop = true
if (associated is GrMember || associated is GroovyFile) stopped = true
}
}