From cd635121ea7856e231865a2aaa1f709154377151 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Sat, 3 Dec 2011 02:36:37 +0400 Subject: [PATCH] (trivial) extract resolveParameterDescriptor method --- .../resolve/java/JavaDescriptorResolver.java | 49 ++++++++++--------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index 6e1178a050d..0aca34c7176 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -326,32 +326,37 @@ public class JavaDescriptorResolver { List result = new ArrayList(); for (int i = 0, parametersLength = parameters.length; i < parametersLength; i++) { PsiParameter parameter = parameters[i]; - String name = parameter.getName(); - PsiType psiType = parameter.getType(); - - JetType varargElementType; - if (psiType instanceof PsiEllipsisType) { - PsiEllipsisType psiEllipsisType = (PsiEllipsisType) psiType; - varargElementType = semanticServices.getTypeTransformer().transformToType(psiEllipsisType.getComponentType()); - } - else { - varargElementType = null; - } - JetType outType = semanticServices.getTypeTransformer().transformToType(psiType); - result.add(new ValueParameterDescriptorImpl( - containingDeclaration, - i, - Collections.emptyList(), // TODO - name == null ? "p" + i : name, - null, // TODO : review - outType, - false, - varargElementType - )); + ValueParameterDescriptor valueParameterDescriptor = resolveParameterDescriptor(containingDeclaration, i, parameter); + result.add(valueParameterDescriptor); } return result; } + private ValueParameterDescriptor resolveParameterDescriptor(DeclarationDescriptor containingDeclaration, int i, PsiParameter parameter) { + String name = parameter.getName(); + PsiType psiType = parameter.getType(); + + JetType varargElementType; + if (psiType instanceof PsiEllipsisType) { + PsiEllipsisType psiEllipsisType = (PsiEllipsisType) psiType; + varargElementType = semanticServices.getTypeTransformer().transformToType(psiEllipsisType.getComponentType()); + } + else { + varargElementType = null; + } + JetType outType = semanticServices.getTypeTransformer().transformToType(psiType); + return new ValueParameterDescriptorImpl( + containingDeclaration, + i, + Collections.emptyList(), // TODO + name == null ? "p" + i : name, + null, // TODO : review + outType, + false, + varargElementType + ); + } + public VariableDescriptor resolveFieldToVariableDescriptor(DeclarationDescriptor containingDeclaration, PsiField field) { VariableDescriptor variableDescriptor = fieldDescriptorCache.get(field); if (variableDescriptor != null) {