[groovy] move @Bindable support with another transformations

This commit is contained in:
Daniil Ovchinnikov
2016-05-20 19:19:40 +03:00
parent f4c3f72c97
commit 2b408b43c8
4 changed files with 8 additions and 8 deletions
@@ -94,7 +94,7 @@ import org.jetbrains.plugins.groovy.lang.psi.typeEnhancers.*;
import org.jetbrains.plugins.groovy.lang.psi.util.GroovyConstantExpressionEvaluator;
import org.jetbrains.plugins.groovy.lang.resolve.*;
import org.jetbrains.plugins.groovy.lang.resolve.ast.*;
import org.jetbrains.plugins.groovy.lang.resolve.ast.bindable.BindableTransformContributor;
import org.jetbrains.plugins.groovy.transformations.impl.BindableTransformationSupport;
import org.jetbrains.plugins.groovy.lang.resolve.ast.builder.strategy.DefaultBuilderStrategySupport;
import org.jetbrains.plugins.groovy.lang.resolve.ast.builder.strategy.ExternalBuilderStrategySupport;
import org.jetbrains.plugins.groovy.lang.resolve.ast.builder.strategy.InitializerBuilderStrategySupport;
@@ -155,7 +155,7 @@ public class GroovyCoreEnvironment {
appEnvironment.addExtension(AstTransformationSupport.EP_NAME, new SimpleBuilderStrategySupport());
appEnvironment.addExtension(AstTransformationSupport.EP_NAME, new ExternalBuilderStrategySupport());
appEnvironment.addExtension(AstTransformationSupport.EP_NAME, new InitializerBuilderStrategySupport());
appEnvironment.addExtension(AstTransformationSupport.EP_NAME, new BindableTransformContributor());
appEnvironment.addExtension(AstTransformationSupport.EP_NAME, new BindableTransformationSupport());
appEnvironment.addExtension(AstTransformationSupport.EP_NAME, new LoggingContributor());
appEnvironment.addExtension(AstTransformationSupport.EP_NAME, new CategoryTransformationSupport());
appEnvironment.addExtension(AstTransformationSupport.EP_NAME, new DelegateTransformationSupport());
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.plugins.groovy.lang.resolve.ast.bindable;
package org.jetbrains.plugins.groovy.transformations.impl;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.psi.*;
@@ -31,7 +31,7 @@ import org.jetbrains.plugins.groovy.transformations.TransformationContext;
import java.util.List;
public class BindableTransformContributor implements AstTransformationSupport {
public class BindableTransformationSupport implements AstTransformationSupport {
private static final String BINDABLE_FQN = "groovy.beans.Bindable";
private static final String PCL_FQN = "java.beans.PropertyChangeListener";
+1 -1
View File
@@ -124,7 +124,7 @@
<astTransformationSupport implementation="org.jetbrains.plugins.groovy.lang.resolve.ast.builder.strategy.SimpleBuilderStrategySupport"/>
<astTransformationSupport implementation="org.jetbrains.plugins.groovy.lang.resolve.ast.builder.strategy.ExternalBuilderStrategySupport"/>
<astTransformationSupport implementation="org.jetbrains.plugins.groovy.lang.resolve.ast.builder.strategy.InitializerBuilderStrategySupport"/>
<astTransformationSupport implementation="org.jetbrains.plugins.groovy.lang.resolve.ast.bindable.BindableTransformContributor"/>
<astTransformationSupport implementation="org.jetbrains.plugins.groovy.transformations.impl.BindableTransformationSupport"/>
<astTransformationSupport implementation="org.jetbrains.plugins.groovy.lang.resolve.ast.LoggingContributor"/>
<astTransformationSupport implementation="org.jetbrains.plugins.groovy.transformations.impl.CategoryTransformationSupport"/>
@@ -26,7 +26,7 @@ import org.jetbrains.plugins.groovy.SetupRule
import org.jetbrains.plugins.groovy.lang.psi.GroovyFile
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrCall
import org.jetbrains.plugins.groovy.lang.resolve.ResolveUtil
import org.jetbrains.plugins.groovy.lang.resolve.ast.bindable.BindableTransformContributor
import org.jetbrains.plugins.groovy.transformations.impl.BindableTransformationSupport
import org.junit.Before
import org.junit.Rule
import org.junit.Test
@@ -86,7 +86,7 @@ class GrBindableSupportTest {
def method = call.resolveMethod() as LightMethodBuilder
assert method
assert method.containingClass == clazz
assert method.originInfo == BindableTransformContributor.ORIGIN_INFO
assert method.originInfo == BindableTransformationSupport.ORIGIN_INFO
assert method.getUserData(ResolveUtil.DOCUMENTATION_DELEGATE)
}
}
@@ -107,7 +107,7 @@ class GrBindableSupportTest {
def method = call.resolveMethod() as LightMethodBuilder
assert method
assert method.containingClass == clazz
assert method.originInfo == BindableTransformContributor.ORIGIN_INFO
assert method.originInfo == BindableTransformationSupport.ORIGIN_INFO
}
}
}