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

rename AstTransformationRenameHelper to GrRenameHelper

Browse Source
This commit is contained in:
Daniil Ovchinnikov
2016-11-01 13:32:33 +03:00
parent cf74003a4e
commit 3dc68a7a20
8 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/META-INF/groovy-indexed-property-support.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<astTransformationSupport
implementation="org.jetbrains.plugins.groovy.transformations.indexedProperty.IndexedPropertyTransformationSupport"
/>
<astTransformationRenameHelper implementation="org.jetbrains.plugins.groovy.transformations.impl.IndexedPropertyRenameHelper"/>
<renameHelper implementation="org.jetbrains.plugins.groovy.transformations.impl.IndexedPropertyRenameHelper"/>
<customAnnotationChecker
implementation="org.jetbrains.plugins.groovy.transformations.indexedProperty.IndexedPropertyAnnotationChecker"
/>
plugins/groovy/src/META-INF/plugin.xml
+3 -3
View File
@@ -32,7 +32,7 @@
<extensionPoint name="membersContributor" interface="org.jetbrains.plugins.groovy.lang.resolve.NonCodeMembersContributor"/>
<extensionPoint name="importContributor" interface="org.jetbrains.plugins.groovy.lang.resolve.GrImportContributor"/>
<extensionPoint name="astTransformationSupport" interface="org.jetbrains.plugins.groovy.transformations.AstTransformationSupport"/>
<extensionPoint name="astTransformationRenameHelper" interface="org.jetbrains.plugins.groovy.transformations.AstTransformationRenameHelper"/>
<extensionPoint name="renameHelper" interface="org.jetbrains.plugins.groovy.refactoring.rename.GrRenameHelper"/>
<extensionPoint name="closureMissingMethodContributor"
interface="org.jetbrains.plugins.groovy.lang.resolve.ClosureMissingMethodContributor"/>
<extensionPoint name="variableEnhancer" interface="org.jetbrains.plugins.groovy.lang.psi.typeEnhancers.GrVariableEnhancer"/>
@@ -133,14 +133,14 @@
<astTransformationSupport implementation="org.jetbrains.plugins.groovy.transformations.impl.BaseScriptTransformationSupport"/>
<astTransformationSupport id="defaultSupport"
implementation="org.jetbrains.plugins.groovy.transformations.impl.DefaultTransformationSupport"/>
<astTransformationRenameHelper implementation="org.jetbrains.plugins.groovy.transformations.impl.DefaultRenameHelper"/>
<renameHelper implementation="org.jetbrains.plugins.groovy.transformations.impl.DefaultRenameHelper"/>
<astTransformationSupport order="after defaultSupport"
implementation="org.jetbrains.plugins.groovy.transformations.impl.FieldScriptTransformationSupport"/>
<astTransformationSupport id="delegateSupport" order="after defaultSupport"
implementation="org.jetbrains.plugins.groovy.transformations.impl.DelegateTransformationSupport"/>
<astTransformationSupport id="traitSupport" order="last"
implementation="org.jetbrains.plugins.groovy.transformations.impl.TraitTransformationSupport"/>
<astTransformationRenameHelper implementation="org.jetbrains.plugins.groovy.transformations.impl.TraitRenameHelper"/>
<renameHelper implementation="org.jetbrains.plugins.groovy.transformations.impl.TraitRenameHelper"/>
<positionManagerDelegate implementation="org.jetbrains.plugins.groovy.gant.GantPositionManagerHelper"/>
plugins/groovy/src/org/jetbrains/plugins/groovy/transformations/AstTransformationRenameHelper.java → plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/GrRenameHelper.java
+3 -5
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.plugins.groovy.transformations;
package org.jetbrains.plugins.groovy.refactoring.rename;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.psi.PsiMember;
@@ -21,11 +21,9 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.transformations.impl.DefaultRenameHelper;
public interface AstTransformationRenameHelper {
public interface GrRenameHelper {
ExtensionPointName<AstTransformationRenameHelper> EP_NAME = ExtensionPointName.create(
"org.intellij.groovy.astTransformationRenameHelper"
);
ExtensionPointName<GrRenameHelper> EP_NAME = ExtensionPointName.create("org.intellij.groovy.renameHelper");
/**
* GrReferenceExpression may resolve to member generated by some AST Transformation from original member.
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameGrFieldProcessor.java
+1 -1
View File
@@ -50,7 +50,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import static org.jetbrains.plugins.groovy.transformations.RenameHelperKt.getNewNameFromTransformations;
import static org.jetbrains.plugins.groovy.refactoring.rename.RenameHelperKt.getNewNameFromTransformations;
/**
* @author ilyas
plugins/groovy/src/org/jetbrains/plugins/groovy/transformations/renameHelper.kt → plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/renameHelper.kt
+2 -2
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.plugins.groovy.transformations
package org.jetbrains.plugins.groovy.refactoring.rename
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiMember
@@ -24,7 +24,7 @@ fun PsiElement?.getNewNameFromTransformations(newName: String) = (this as? PsiMe
private fun doGetNewNameFromTransformations(member: PsiMember, newName: String): String? {
@Suppress("LoopToCallChain")
for (helper in AstTransformationRenameHelper.EP_NAME.extensions) {
for (helper in GrRenameHelper.EP_NAME.extensions) {
val newMemberName = helper.getNewMemberName(member, newName)
if (newMemberName != null) return newMemberName
}
plugins/groovy/src/org/jetbrains/plugins/groovy/transformations/impl/DefaultRenameHelper.kt
+2 -2
View File
@@ -19,9 +19,9 @@ import com.intellij.psi.PsiMember
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrAccessorMethod
import org.jetbrains.plugins.groovy.lang.psi.util.GroovyPropertyUtils.getAccessorName
import org.jetbrains.plugins.groovy.lang.psi.util.GroovyPropertyUtils.getSetterName
import org.jetbrains.plugins.groovy.transformations.AstTransformationRenameHelper
import org.jetbrains.plugins.groovy.refactoring.rename.GrRenameHelper
class DefaultRenameHelper : AstTransformationRenameHelper {
class DefaultRenameHelper : GrRenameHelper {
override fun getNewMemberName(member: PsiMember, newOriginalName: String): String? {
if (member !is GrAccessorMethod) return null
plugins/groovy/src/org/jetbrains/plugins/groovy/transformations/impl/IndexedPropertyRenameHelper.kt
+2 -2
View File
@@ -17,10 +17,10 @@ package org.jetbrains.plugins.groovy.transformations.impl
import com.intellij.psi.PsiMember
import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GrLightMethodBuilder
import org.jetbrains.plugins.groovy.transformations.AstTransformationRenameHelper
import org.jetbrains.plugins.groovy.refactoring.rename.GrRenameHelper
import org.jetbrains.plugins.groovy.transformations.indexedProperty.indexedMethodKind
class IndexedPropertyRenameHelper : AstTransformationRenameHelper {
class IndexedPropertyRenameHelper : GrRenameHelper {
override fun getNewMemberName(member: PsiMember, newName: String): String? {
if (member !is GrLightMethodBuilder || member.methodKind != indexedMethodKind) return null
plugins/groovy/src/org/jetbrains/plugins/groovy/transformations/impl/TraitRenameHelper.kt
+2 -2
View File
@@ -18,9 +18,9 @@ package org.jetbrains.plugins.groovy.transformations.impl
import com.intellij.psi.PsiMember
import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GrTraitField
import org.jetbrains.plugins.groovy.lang.psi.util.GrTraitUtil
import org.jetbrains.plugins.groovy.transformations.AstTransformationRenameHelper
import org.jetbrains.plugins.groovy.refactoring.rename.GrRenameHelper
class TraitRenameHelper : AstTransformationRenameHelper {
class TraitRenameHelper : GrRenameHelper {
override fun getNewMemberName(member: PsiMember, newOriginalName: String): String? {
if (member !is GrTraitField) return null