From 68a6163709f107ab5469c8d604f50217cfd409df Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Sun, 21 Aug 2011 23:16:12 +0400 Subject: [PATCH] Simplifying methodDescriptor bean. --- .../path/GrDescriptorReturnTypeCalculator.java | 18 +++++++++--------- .../path/GrMethodReturnTypeDescriptor.java | 9 ++------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrDescriptorReturnTypeCalculator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrDescriptorReturnTypeCalculator.java index a76274b97507..d01d5fb4239c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrDescriptorReturnTypeCalculator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrDescriptorReturnTypeCalculator.java @@ -49,21 +49,21 @@ public class GrDescriptorReturnTypeCalculator extends GrCallExpressionTypeCalcul GrMethodReturnTypeDescriptor.Param[] params; - if (descriptor.anyParams != null) { - assert descriptor.anyParams.length == 1; - assert descriptor.params == null; - assert pairs.isEmpty(); - - params = null; - } - else { + if (descriptor.params != null) { params = descriptor.params; - if (params == null) params = GrMethodReturnTypeDescriptor.Param.EMPTY_ARRAY; + assert params != null; + assert (descriptor.checkParamsType == null || descriptor.checkParamsType); for (GrMethodReturnTypeDescriptor.Param param : params) { assert StringUtil.isNotEmpty(param.type); } } + else if (descriptor.checkParamsType != null && descriptor.checkParamsType) { + params = GrMethodReturnTypeDescriptor.Param.EMPTY_ARRAY; + } + else { + params = null; + } assert StringUtil.isNotEmpty(descriptor.returnType); pairs.add(new Pair(params, descriptor.returnType)); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrMethodReturnTypeDescriptor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrMethodReturnTypeDescriptor.java index 791670457750..1b0c49c5d2fc 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrMethodReturnTypeDescriptor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrMethodReturnTypeDescriptor.java @@ -23,9 +23,8 @@ public class GrMethodReturnTypeDescriptor { @Attribute("returnType") public String returnType; - @Property(surroundWithTag = false) - @AbstractCollection(surroundWithTag = false) - public AnyParams[] anyParams; + @Attribute("checkParamsType") + public Boolean checkParamsType; @Property(surroundWithTag = false) @AbstractCollection(surroundWithTag = false) @@ -40,8 +39,4 @@ public class GrMethodReturnTypeDescriptor { public String type; } - @Tag("anyParams") - public static class AnyParams { - - } }