KT-389 Wrong type inference for varargs etc.

2011-11-01 17:40:43 +03:00
parent 496bdc2879
commit 739417dc9d
14 changed files with 118 additions and 59 deletions
@@ -300,15 +300,26 @@ public class JavaDescriptorResolver {
        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.<AnnotationDescriptor>emptyList(), // TODO
                    name == null ? "p" + i : name,
                    null, // TODO : review
-                    semanticServices.getTypeTransformer().transformToType(parameter.getType()),
+                    outType,
                    false,
-                    parameter.isVarArgs()
+                    varargElementType
            ));
        }
        return result;