JavaDescriptorResolver.java 71.2 KB
Newer Older
1 2
package org.jetbrains.jet.lang.resolve.java;

3
import com.google.common.collect.Lists;
A
Andrey Breslav 已提交
4
import com.google.common.collect.Maps;
A
Andrey Breslav 已提交
5
import com.google.common.collect.Sets;
6
import com.intellij.openapi.project.Project;
7
import com.intellij.openapi.util.Pair;
8
import com.intellij.openapi.vfs.VirtualFile;
9
import com.intellij.psi.*;
10
import com.intellij.psi.impl.compiled.ClsClassImpl;
11
import com.intellij.psi.search.DelegatingGlobalSearchScope;
12
import com.intellij.psi.search.GlobalSearchScope;
13
import jet.typeinfo.TypeInfoVariance;
14 15
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
16
import org.jetbrains.jet.lang.descriptors.*;
A
Andrey Breslav 已提交
17
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
18
import org.jetbrains.jet.lang.resolve.BindingContext;
19
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
M
Maxim Shafirov 已提交
20
import org.jetbrains.jet.lang.resolve.java.alt.AltClassFinder;
21
import org.jetbrains.jet.lang.resolve.java.kt.JetClassAnnotation;
22
import org.jetbrains.jet.lang.types.*;
23
import org.jetbrains.jet.plugin.JetFileType;
24
import org.jetbrains.jet.rt.signature.JetSignatureAdapter;
25 26 27
import org.jetbrains.jet.rt.signature.JetSignatureExceptionsAdapter;
import org.jetbrains.jet.rt.signature.JetSignatureReader;
import org.jetbrains.jet.rt.signature.JetSignatureVisitor;
28

29
import java.util.*;
30 31 32 33 34

/**
 * @author abreslav
 */
public class JavaDescriptorResolver {
35 36
    
    public static String JAVA_ROOT = "<java_root>";
37

38 39
    /*package*/ static final DeclarationDescriptor JAVA_METHOD_TYPE_PARAMETER_PARENT = new DeclarationDescriptorImpl(null, Collections.<AnnotationDescriptor>emptyList(), "<java_generic_method>") {

40 41
        @Override
        public DeclarationDescriptor substitute(TypeSubstitutor substitutor) {
42
            throw new UnsupportedOperationException();
43 44
        }

45 46
        @Override
        public <R, D> R accept(DeclarationDescriptorVisitor<R, D> visitor, D data) {
47
            return visitor.visitDeclarationDescriptor(this, data);
48 49 50
        }
    };

A
Andrey Breslav 已提交
51
    /*package*/ static final DeclarationDescriptor JAVA_CLASS_OBJECT = new DeclarationDescriptorImpl(null, Collections.<AnnotationDescriptor>emptyList(), "<java_class_object_emulation>") {
A
Andrey Breslav 已提交
52 53 54
        @NotNull
        @Override
        public DeclarationDescriptor substitute(TypeSubstitutor substitutor) {
55
            throw new UnsupportedOperationException();
A
Andrey Breslav 已提交
56 57 58 59 60 61 62
        }

        @Override
        public <R, D> R accept(DeclarationDescriptorVisitor<R, D> visitor, D data) {
            return visitor.visitDeclarationDescriptor(this, data);
        }
    };
63 64 65 66 67 68
    
    private enum TypeParameterDescriptorOrigin {
        JAVA,
        KOTLIN,
    }
    
69 70
    public static class TypeParameterDescriptorInitialization {
        @NotNull
71
        private final TypeParameterDescriptorOrigin origin;
72 73 74
        @NotNull
        final TypeParameterDescriptor descriptor;
        final PsiTypeParameter psiTypeParameter;
75 76 77 78
        @Nullable
        private final List<JetType> upperBoundsForKotlin;
        @Nullable
        private final List<JetType> lowerBoundsForKotlin;
79

80
        private TypeParameterDescriptorInitialization(@NotNull TypeParameterDescriptor descriptor, @NotNull PsiTypeParameter psiTypeParameter) {
81
            this.origin = TypeParameterDescriptorOrigin.JAVA;
82
            this.descriptor = descriptor;
83
            this.psiTypeParameter = psiTypeParameter;
84 85 86 87
            this.upperBoundsForKotlin = null;
            this.lowerBoundsForKotlin = null;
        }

88
        private TypeParameterDescriptorInitialization(@NotNull TypeParameterDescriptor descriptor, @NotNull PsiTypeParameter psiTypeParameter,
89 90 91
                List<JetType> upperBoundsForKotlin, List<JetType> lowerBoundsForKotlin) {
            this.origin = TypeParameterDescriptorOrigin.KOTLIN;
            this.descriptor = descriptor;
92
            this.psiTypeParameter = psiTypeParameter;
93 94
            this.upperBoundsForKotlin = upperBoundsForKotlin;
            this.lowerBoundsForKotlin = lowerBoundsForKotlin;
95 96
        }
    }
97 98


99
    private static abstract class ResolverScopeData {
100
        protected boolean kotlin;
101 102
        
        private Map<String, NamedMembers> namedMembersMap;
103
    }
A
Andrey Breslav 已提交
104

105 106 107 108 109 110
    static abstract class ResolverClassData extends ResolverScopeData {

        @NotNull
        public abstract ClassDescriptor getClassDescriptor();
    }

111
    /** Class with instance members */
112 113 114 115 116
    static class ResolverBinaryClassData extends ResolverClassData {

        ResolverBinaryClassData() {
        }

117
        private MutableClassDescriptorLite classDescriptor;
118

119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136
        List<TypeParameterDescriptorInitialization> typeParameters;

        @Override
        @NotNull
        public ClassDescriptor getClassDescriptor() {
            return classDescriptor;
        }
    }

    static class ResolverSrcClassData extends ResolverClassData {
        @NotNull
        private final ClassDescriptor classDescriptor;

        ResolverSrcClassData(@NotNull ClassDescriptor classDescriptor) {
            this.classDescriptor = classDescriptor;
        }

        @Override
137 138 139 140 141 142
        @NotNull
        public ClassDescriptor getClassDescriptor() {
            return classDescriptor;
        }
    }

143
    /** Either package or class with static members */
144
    private static class ResolverNamespaceData extends ResolverScopeData {
145 146 147 148 149 150 151 152
        private JavaNamespaceDescriptor namespaceDescriptor;

        @NotNull
        public NamespaceDescriptor getNamespaceDescriptor() {
            return namespaceDescriptor;
        }
    }

153
    protected final Map<String, ResolverBinaryClassData> classDescriptorCache = Maps.newHashMap();
154 155 156
    protected final Map<String, ResolverNamespaceData> namespaceDescriptorCacheByFqn = Maps.newHashMap();
    protected final Map<PsiElement, ResolverNamespaceData> namespaceDescriptorCache = Maps.newHashMap();

A
Andrey Breslav 已提交
157
    protected final Map<PsiMethod, FunctionDescriptor> methodDescriptorCache = Maps.newHashMap();
158 159 160
    protected final JavaPsiFacade javaFacade;
    protected final GlobalSearchScope javaSearchScope;
    protected final JavaSemanticServices semanticServices;
M
Maxim Shafirov 已提交
161
    private final AltClassFinder altClassFinder;
162 163 164

    public JavaDescriptorResolver(Project project, JavaSemanticServices semanticServices) {
        this.javaFacade = JavaPsiFacade.getInstance(project);
165 166 167 168 169 170
        this.javaSearchScope = new DelegatingGlobalSearchScope(GlobalSearchScope.allScope(project)) {
            @Override
            public boolean contains(VirtualFile file) {
                return myBaseScope.contains(file) && file.getFileType() != JetFileType.INSTANCE;
            }
        };
171
        this.semanticServices = semanticServices;
M
Maxim Shafirov 已提交
172
        altClassFinder = new AltClassFinder(project);
173
    }
174
    
175
    @Nullable
176
    ResolverClassData resolveClassData(@NotNull PsiClass psiClass) {
177
        String qualifiedName = psiClass.getQualifiedName();
178

179 180 181 182
        if (qualifiedName.endsWith(JvmAbi.TRAIT_IMPL_SUFFIX)) {
            // TODO: only if -$$TImpl class is created by Kotlin
            return null;
        }
183

184
        // First, let's check that this is a real Java class, not a Java's view on a Kotlin class:
185 186
        ClassDescriptor kotlinClassDescriptor = semanticServices.getKotlinClassDescriptor(qualifiedName);
        if (kotlinClassDescriptor != null) {
187
            return new ResolverSrcClassData(kotlinClassDescriptor);
188 189
        }

190
        // Not let's take a descriptor of a Java class
191
        ResolverBinaryClassData classData = classDescriptorCache.get(qualifiedName);
192 193 194
        if (classData == null) {
            classData = createJavaClassDescriptor(psiClass);
            classDescriptorCache.put(qualifiedName, classData);
195
        }
196 197 198 199 200 201 202 203 204 205 206
        return classData;
    }

    @Nullable
    public ClassDescriptor resolveClass(@NotNull PsiClass psiClass) {
        ResolverClassData classData = resolveClassData(psiClass);
        if (classData != null) {
            return classData.getClassDescriptor();
        } else {
            return null;
        }
207 208 209 210
    }

    @Nullable
    public ClassDescriptor resolveClass(@NotNull String qualifiedName) {
211

212 213 214 215 216
        if (qualifiedName.endsWith(JvmAbi.TRAIT_IMPL_SUFFIX)) {
            // TODO: only if -$$TImpl class is created by Kotlin
            return null;
        }
        
217
        // First, let's check that this is a real Java class, not a Java's view on a Kotlin class:
218 219 220 221 222
        ClassDescriptor kotlinClassDescriptor = semanticServices.getKotlinClassDescriptor(qualifiedName);
        if (kotlinClassDescriptor != null) {
            return kotlinClassDescriptor;
        }

223
        // Not let's take a descriptor of a Java class
224
        ResolverBinaryClassData classData = classDescriptorCache.get(qualifiedName);
225
        if (classData == null) {
226
            PsiClass psiClass = findClass(qualifiedName);
227 228 229
            if (psiClass == null) {
                return null;
            }
230
            classData = createJavaClassDescriptor(psiClass);
231
        }
232
        return classData.getClassDescriptor();
233 234
    }

235
    private ResolverBinaryClassData createJavaClassDescriptor(@NotNull final PsiClass psiClass) {
A
Andrey Breslav 已提交
236 237 238
        assert !classDescriptorCache.containsKey(psiClass.getQualifiedName()) : psiClass.getQualifiedName();
        classDescriptorCache.put(psiClass.getQualifiedName(), null); // TODO

239
        String name = psiClass.getName();
240
        ResolverBinaryClassData classData = new ResolverBinaryClassData();
241
        ClassKind kind = psiClass.isInterface() ? (psiClass.isAnnotationType() ? ClassKind.ANNOTATION_CLASS : ClassKind.TRAIT) : ClassKind.CLASS;
242 243
        classData.classDescriptor = new MutableClassDescriptorLite(
                resolveParentDescriptor(psiClass), kind
244
        );
245
        classData.classDescriptor.setName(name);
246
        
247
        class OuterClassTypeVariableByNameResolver implements TypeVariableByNameResolver {
248 249 250 251 252 253 254 255

            @NotNull
            @Override
            public TypeParameterDescriptor getTypeVariable(@NotNull String name) {
                throw new IllegalStateException("not implemented"); // TODO
            }
        }

A
Andrey Breslav 已提交
256
        List<JetType> supertypes = new ArrayList<JetType>();
257

258 259 260 261 262 263 264
        classData.typeParameters = createUninitializedClassTypeParameters(psiClass, classData, new OuterClassTypeVariableByNameResolver());
        
        List<TypeParameterDescriptor> typeParameters = new ArrayList<TypeParameterDescriptor>();
        for (TypeParameterDescriptorInitialization typeParameter : classData.typeParameters) {
            typeParameters.add(typeParameter.descriptor);
        }
        
265 266 267
        classData.classDescriptor.setTypeParameterDescriptors(typeParameters);
        classData.classDescriptor.setSupertypes(supertypes);
        classData.classDescriptor.setVisibility(resolveVisibilityFromPsiModifiers(psiClass));
268
        classData.classDescriptor.setModality(Modality.convertFromFlags(
269 270
                psiClass.hasModifierProperty(PsiModifier.ABSTRACT) || psiClass.isInterface(),
                !psiClass.hasModifierProperty(PsiModifier.FINAL))
A
Andrey Breslav 已提交
271
        );
272
        classData.classDescriptor.createTypeConstructor();
273
        classDescriptorCache.put(psiClass.getQualifiedName(), classData);
274
        classData.classDescriptor.setScopeForMemberLookup(new JavaClassMembersScope(classData.classDescriptor, psiClass, semanticServices, false));
275

276 277 278
        initializeTypeParameters(classData.typeParameters, new TypeVariableResoverFromTypeDescriptorsInitialization(new ArrayList<TypeParameterDescriptorInitialization>(), null));

        TypeVariableResoverFromTypeDescriptorsInitialization resolverForTypeParameters = new TypeVariableResoverFromTypeDescriptorsInitialization(classData.typeParameters, null);
279

280
        // TODO: ugly hack: tests crash if initializeTypeParameters called with class containing proper supertypes
281
        supertypes.addAll(getSupertypes(new PsiClassWrapper(psiClass), classData.typeParameters));
282

283
        if (psiClass.isInterface()) {
284
            //classData.classDescriptor.setSuperclassType(JetStandardClasses.getAnyType()); // TODO : Make it java.lang.Object
285 286 287 288 289 290
        }
        else {
            PsiClassType[] extendsListTypes = psiClass.getExtendsListTypes();
            assert extendsListTypes.length == 0 || extendsListTypes.length == 1;
            JetType superclassType = extendsListTypes.length == 0
                                            ? JetStandardClasses.getAnyType()
291
                                            : semanticServices.getTypeTransformer().transformToType(extendsListTypes[0], resolverForTypeParameters);
292
            //classData.classDescriptor.setSuperclassType(superclassType);
293
        }
A
Andrey Breslav 已提交
294 295

        PsiMethod[] psiConstructors = psiClass.getConstructors();
296 297

        if (psiConstructors.length == 0) {
A
Andrey Breslav 已提交
298 299 300 301
            // We need to create default constructors for classes and abstract classes.
            // Example:
            // class Kotlin() : Java() {}
            // abstract public class Java {}
302
            if (!psiClass.isInterface()) {
303
                ConstructorDescriptorImpl constructorDescriptor = new ConstructorDescriptorImpl(
304
                        classData.classDescriptor,
A
Andrey Breslav 已提交
305
                        Collections.<AnnotationDescriptor>emptyList(),
306
                        false);
307 308
                constructorDescriptor.initialize(typeParameters, Collections.<ValueParameterDescriptor>emptyList(), Modality.FINAL, classData.classDescriptor.getVisibility());
                constructorDescriptor.setReturnType(classData.classDescriptor.getDefaultType());
309
                classData.classDescriptor.addConstructor(constructorDescriptor, null);
310
                semanticServices.getTrace().record(BindingContext.CONSTRUCTOR, psiClass, constructorDescriptor);
311
            }
312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332
            if (psiClass.isAnnotationType()) {
                // A constructor for an annotation type takes all the "methods" in the @interface as parameters
                ConstructorDescriptorImpl constructorDescriptor = new ConstructorDescriptorImpl(
                        classData.classDescriptor,
                        Collections.<AnnotationDescriptor>emptyList(),
                        false);

                List<ValueParameterDescriptor> valueParameters = Lists.newArrayList();
                PsiMethod[] methods = psiClass.getMethods();
                for (int i = 0; i < methods.length; i++) {
                    PsiMethod method = methods[i];
                    if (method instanceof PsiAnnotationMethod) {
                        PsiAnnotationMethod annotationMethod = (PsiAnnotationMethod) method;
                        assert annotationMethod.getParameterList().getParameters().length == 0;

                        PsiType returnType = annotationMethod.getReturnType();

                        // We take the following heuristical convention:
                        // if the last method of the @interface is an array, we convert it into a vararg
                        JetType varargElementType = null;
                        if (i == methods.length - 1 && (returnType instanceof PsiArrayType)) {
333
                            varargElementType = semanticServices.getTypeTransformer().transformToType(((PsiArrayType) returnType).getComponentType(), resolverForTypeParameters);
334 335 336 337 338 339 340 341
                        }

                        valueParameters.add(new ValueParameterDescriptorImpl(
                                constructorDescriptor,
                                i,
                                Collections.<AnnotationDescriptor>emptyList(),
                                method.getName(),
                                false,
342
                                semanticServices.getTypeTransformer().transformToType(returnType, resolverForTypeParameters),
343 344 345 346 347 348 349 350 351 352
                                annotationMethod.getDefaultValue() != null,
                                varargElementType));
                    }
                }

                constructorDescriptor.initialize(typeParameters, valueParameters, Modality.FINAL, classData.classDescriptor.getVisibility());
                constructorDescriptor.setReturnType(classData.classDescriptor.getDefaultType());
                classData.classDescriptor.addConstructor(constructorDescriptor, null);
                semanticServices.getTrace().record(BindingContext.CONSTRUCTOR, psiClass, constructorDescriptor);
            }
353 354
        }
        else {
355 356 357 358 359
            for (PsiMethod psiConstructor : psiConstructors) {
                PsiMethodWrapper constructor = new PsiMethodWrapper(psiConstructor);

                if (constructor.getJetConstructor().hidden()) {
                    continue;
360 361
                }

362
                ConstructorDescriptorImpl constructorDescriptor = new ConstructorDescriptorImpl(
363
                        classData.classDescriptor,
A
Andrey Breslav 已提交
364
                        Collections.<AnnotationDescriptor>emptyList(), // TODO
365
                        false);
366
                ValueParameterDescriptors valueParameterDescriptors = resolveParameterDescriptors(constructorDescriptor,
367
                        constructor.getParameters(),
368
                        new TypeVariableResoverFromTypeDescriptorsInitialization(classData.typeParameters, null) // TODO: outer too
369
                    );
370 371 372 373
                if (valueParameterDescriptors.receiverType != null) {
                    throw new IllegalStateException();
                }
                constructorDescriptor.initialize(typeParameters, valueParameterDescriptors.descriptors, Modality.FINAL,
374
                                                 resolveVisibilityFromPsiModifiers(psiConstructor));
375
                constructorDescriptor.setReturnType(classData.classDescriptor.getDefaultType());
376
                classData.classDescriptor.addConstructor(constructorDescriptor, null);
377
                semanticServices.getTrace().record(BindingContext.CONSTRUCTOR, psiConstructor, constructorDescriptor);
378
            }
A
Andrey Breslav 已提交
379
        }
380

381
        semanticServices.getTrace().record(BindingContext.CLASS, psiClass, classData.classDescriptor);
382

383
        return classData;
384 385
    }

386
    private List<TypeParameterDescriptorInitialization> createUninitializedClassTypeParameters(PsiClass psiClass, ResolverBinaryClassData classData, TypeVariableByNameResolver typeVariableByNameResolver) {
387 388 389 390 391
        JetClassAnnotation jetClassAnnotation = JetClassAnnotation.get(psiClass);
        classData.kotlin = jetClassAnnotation.isDefined();
        
        if (jetClassAnnotation.signature().length() > 0) {
            return resolveClassTypeParametersFromJetSignature(
392
                    jetClassAnnotation.signature(), psiClass, classData.classDescriptor, typeVariableByNameResolver);
393
        }
394

395
        return makeUninitializedTypeParameters(classData.classDescriptor, psiClass.getTypeParameters());
396 397
    }

398
    @NotNull
399
    private PsiTypeParameter getPsiTypeParameterByName(PsiTypeParameterListOwner clazz, String name) {
400 401 402 403 404
        for (PsiTypeParameter typeParameter : clazz.getTypeParameters()) {
            if (typeParameter.getName().equals(name)) {
                return typeParameter; 
            }
        }
405 406 407
        throw new IllegalStateException("PsiTypeParameter '" + name + "' is not found");
    }

S
Stepan Koltsov 已提交
408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424

    // cache
    protected ClassDescriptor javaLangObject;

    @NotNull
    private ClassDescriptor getJavaLangObject() {
        if (javaLangObject == null) {
            javaLangObject = resolveClass("java.lang.Object");
        }
        return javaLangObject;
    }

    private boolean isJavaLangObject(JetType type) {
        return type.getConstructor().getDeclarationDescriptor() == getJavaLangObject();
    }


425 426 427 428 429
    private abstract class JetSignatureTypeParameterVisitor extends JetSignatureExceptionsAdapter {
        
        private final DeclarationDescriptor containingDeclaration;
        private final PsiTypeParameterListOwner psiOwner;
        private final String name;
430
        private final boolean reified;
431
        private final int index;
432
        private final TypeInfoVariance variance;
433
        private final TypeVariableByNameResolver typeVariableByNameResolver;
434 435

        protected JetSignatureTypeParameterVisitor(DeclarationDescriptor containingDeclaration, PsiTypeParameterListOwner psiOwner,
436
                String name, boolean reified, int index, TypeInfoVariance variance, TypeVariableByNameResolver typeVariableByNameResolver)
437
        {
438 439 440 441
            if (name.isEmpty()) {
                throw new IllegalStateException();
            }
            
442 443 444
            this.containingDeclaration = containingDeclaration;
            this.psiOwner = psiOwner;
            this.name = name;
445
            this.reified = reified;
446
            this.index = index;
447
            this.variance = variance;
448
            this.typeVariableByNameResolver = typeVariableByNameResolver;
449 450 451 452
        }

        List<JetType> upperBounds = new ArrayList<JetType>();
        List<JetType> lowerBounds = new ArrayList<JetType>();
S
Stepan Koltsov 已提交
453
        
454 455
        @Override
        public JetSignatureVisitor visitClassBound() {
456
            return new JetTypeJetSignatureReader(semanticServices, semanticServices.getJetSemanticServices().getStandardLibrary(), typeVariableByNameResolver) {
457 458
                @Override
                protected void done(@NotNull JetType jetType) {
S
Stepan Koltsov 已提交
459 460 461
                    if (isJavaLangObject(jetType)) {
                        return;
                    }
462 463 464 465 466 467 468
                    upperBounds.add(jetType);
                }
            };
        }

        @Override
        public JetSignatureVisitor visitInterfaceBound() {
469
            return new JetTypeJetSignatureReader(semanticServices, semanticServices.getJetSemanticServices().getStandardLibrary(), typeVariableByNameResolver) {
470 471 472 473 474 475 476 477 478 479 480 481
                @Override
                protected void done(@NotNull JetType jetType) {
                    upperBounds.add(jetType);
                }
            };
        }

        @Override
        public void visitFormalTypeParameterEnd() {
            TypeParameterDescriptor typeParameter = TypeParameterDescriptor.createForFurtherModification(
                    containingDeclaration,
                    Collections.<AnnotationDescriptor>emptyList(), // TODO: wrong
482
                    reified,
483 484
                    JetSignatureUtils.translateVariance(variance),
                    name,
485
                    index);
486
            PsiTypeParameter psiTypeParameter = getPsiTypeParameterByName(psiOwner, name);
487 488
            TypeParameterDescriptorInitialization typeParameterDescriptorInitialization = new TypeParameterDescriptorInitialization(typeParameter, psiTypeParameter, upperBounds, lowerBounds);
            done(typeParameterDescriptorInitialization);
489 490
        }
        
491
        protected abstract void done(@NotNull TypeParameterDescriptorInitialization typeParameterDescriptor);
492 493
    }

494 495 496
    /**
     * @see #resolveMethodTypeParametersFromJetSignature(String, FunctionDescriptor)
     */
497 498 499
    private List<TypeParameterDescriptorInitialization> resolveClassTypeParametersFromJetSignature(String jetSignature, final PsiClass clazz,
            final ClassDescriptor classDescriptor, final TypeVariableByNameResolver outerClassTypeVariableByNameResolver) {
        final List<TypeParameterDescriptorInitialization> r = new ArrayList<TypeParameterDescriptorInitialization>();
500
        
501
        class MyTypeVariableByNameResolver implements TypeVariableByNameResolver {
502 503 504 505

            @NotNull
            @Override
            public TypeParameterDescriptor getTypeVariable(@NotNull String name) {
506 507 508
                for (TypeParameterDescriptorInitialization typeParameter : r) {
                    if (typeParameter.descriptor.getName().equals(name)) {
                        return typeParameter.descriptor;
509 510
                    }
                }
511
                return outerClassTypeVariableByNameResolver.getTypeVariable(name);
512 513 514
            }
        }
        
515
        new JetSignatureReader(jetSignature).accept(new JetSignatureExceptionsAdapter() {
516 517
            private int formalTypeParameterIndex = 0;
            
518
            @Override
519
            public JetSignatureVisitor visitFormalTypeParameter(final String name, final TypeInfoVariance variance, boolean reified) {
520
                return new JetSignatureTypeParameterVisitor(classDescriptor, clazz, name, reified, formalTypeParameterIndex++, variance, new MyTypeVariableByNameResolver()) {
521
                    @Override
522
                    protected void done(TypeParameterDescriptorInitialization typeParameterDescriptor) {
523
                        r.add(typeParameterDescriptor);
524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542
                    }
                };
            }

            @Override
            public JetSignatureVisitor visitSuperclass() {
                // TODO
                return new JetSignatureAdapter();
            }

            @Override
            public JetSignatureVisitor visitInterface() {
                // TODO
                return new JetSignatureAdapter();
            }
        });
        return r;
    }

543 544 545
    private DeclarationDescriptor resolveParentDescriptor(PsiClass psiClass) {
        PsiClass containingClass = psiClass.getContainingClass();
        if (containingClass != null) {
546
            return resolveClass(containingClass);
547 548 549 550 551 552 553
        }
        
        PsiJavaFile containingFile = (PsiJavaFile) psiClass.getContainingFile();
        String packageName = containingFile.getPackageName();
        return resolveNamespace(packageName);
    }

554 555
    private List<TypeParameterDescriptorInitialization> makeUninitializedTypeParameters(@NotNull DeclarationDescriptor containingDeclaration, @NotNull PsiTypeParameter[] typeParameters) {
        List<TypeParameterDescriptorInitialization> result = Lists.newArrayList();
556
        for (PsiTypeParameter typeParameter : typeParameters) {
557
            TypeParameterDescriptorInitialization typeParameterDescriptor = makeUninitializedTypeParameter(containingDeclaration, typeParameter);
A
Andrey Breslav 已提交
558
            result.add(typeParameterDescriptor);
559 560 561 562
        }
        return result;
    }

563
    @NotNull
564
    private TypeParameterDescriptorInitialization makeUninitializedTypeParameter(@NotNull DeclarationDescriptor containingDeclaration, @NotNull PsiTypeParameter psiTypeParameter) {
565
        TypeParameterDescriptor typeParameterDescriptor = TypeParameterDescriptor.createForFurtherModification(
566
                containingDeclaration,
A
Andrey Breslav 已提交
567
                Collections.<AnnotationDescriptor>emptyList(), // TODO
A
Andrey Breslav 已提交
568
                false,
569
                Variance.INVARIANT,
570 571
                psiTypeParameter.getName(),
                psiTypeParameter.getIndex()
572
        );
573
        return new TypeParameterDescriptorInitialization(typeParameterDescriptor, psiTypeParameter);
574 575
    }

576 577 578 579
    private void initializeTypeParameter(TypeParameterDescriptorInitialization typeParameter, TypeVariableByPsiResolver typeVariableByPsiResolver) {
        TypeParameterDescriptor typeParameterDescriptor = typeParameter.descriptor;
        if (typeParameter.origin == TypeParameterDescriptorOrigin.KOTLIN) {
            List<?> upperBounds = typeParameter.upperBoundsForKotlin;
580 581 582
            if (upperBounds.size() == 0){
                typeParameterDescriptor.addUpperBound(JetStandardClasses.getNullableAnyType());
            } else {
583
                for (JetType upperBound : typeParameter.upperBoundsForKotlin) {
584 585 586 587 588
                    typeParameterDescriptor.addUpperBound(upperBound);
                }
            }

            // TODO: lower bounds
589
        } else {
590
            PsiClassType[] referencedTypes = typeParameter.psiTypeParameter.getExtendsList().getReferencedTypes();
591 592 593 594
            if (referencedTypes.length == 0){
                typeParameterDescriptor.addUpperBound(JetStandardClasses.getNullableAnyType());
            }
            else if (referencedTypes.length == 1) {
595
                typeParameterDescriptor.addUpperBound(semanticServices.getTypeTransformer().transformToType(referencedTypes[0], typeVariableByPsiResolver));
596 597 598
            }
            else {
                for (PsiClassType referencedType : referencedTypes) {
599
                    typeParameterDescriptor.addUpperBound(semanticServices.getTypeTransformer().transformToType(referencedType, typeVariableByPsiResolver));
600
                }
A
Andrey Breslav 已提交
601 602
            }
        }
603
        typeParameterDescriptor.setInitialized();
604 605
    }

606 607 608 609 610
    private void initializeTypeParameters(List<TypeParameterDescriptorInitialization> typeParametersInitialization, TypeVariableResolver typeVariableByPsiResolver) {
        List<TypeParameterDescriptorInitialization> prevTypeParameters = new ArrayList<TypeParameterDescriptorInitialization>();
        for (TypeParameterDescriptorInitialization psiTypeParameter : typeParametersInitialization) {
            prevTypeParameters.add(psiTypeParameter);
            initializeTypeParameter(psiTypeParameter, new TypeVariableResoverFromTypeDescriptorsInitialization(prevTypeParameters, typeVariableByPsiResolver));
S
Stepan Koltsov 已提交
611
        }
A
Andrey Breslav 已提交
612 613
    }

614
    private Collection<? extends JetType> getSupertypes(PsiClassWrapper psiClass, List<TypeParameterDescriptorInitialization> typeParameters) {
615 616 617
        final List<JetType> result = new ArrayList<JetType>();

        if (psiClass.getJetClass().signature().length() > 0) {
618
            final TypeVariableResolver typeVariableResolver = new TypeVariableResoverFromTypeDescriptorsInitialization(typeParameters, null);
619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651
            
            new JetSignatureReader(psiClass.getJetClass().signature()).accept(new JetSignatureExceptionsAdapter() {
                @Override
                public JetSignatureVisitor visitFormalTypeParameter(String name, TypeInfoVariance variance, boolean reified) {
                    // TODO: collect
                    return new JetSignatureAdapter();
                }

                @Override
                public JetSignatureVisitor visitSuperclass() {
                    return new JetTypeJetSignatureReader(semanticServices, semanticServices.getJetSemanticServices().getStandardLibrary(), typeVariableResolver) {
                        @Override
                        protected void done(@NotNull JetType jetType) {
                            if (!jetType.equals(JetStandardClasses.getAnyType())) {
                                result.add(jetType);
                            }
                        }
                    };
                }

                @Override
                public JetSignatureVisitor visitInterface() {
                    return new JetTypeJetSignatureReader(semanticServices, semanticServices.getJetSemanticServices().getStandardLibrary(), typeVariableResolver) {
                        @Override
                        protected void done(@NotNull JetType jetType) {
                            if (!jetType.equals(JetStandardClasses.getAnyType())) {
                                result.add(jetType);
                            }
                        }
                    };
                }
            });
        } else {
652 653
            transformSupertypeList(result, psiClass.getPsiClass().getExtendsListTypes(), new TypeVariableResoverFromTypeDescriptorsInitialization(typeParameters, null));
            transformSupertypeList(result, psiClass.getPsiClass().getImplementsListTypes(), new TypeVariableResoverFromTypeDescriptorsInitialization(typeParameters, null));
654 655 656 657
        }
        if (result.isEmpty()) {
            result.add(JetStandardClasses.getAnyType());
        }
658 659 660
        return result;
    }

661
    private void transformSupertypeList(List<JetType> result, PsiClassType[] extendsListTypes, TypeVariableResolver typeVariableResolver) {
662
        for (PsiClassType type : extendsListTypes) {
663 664 665 666 667
            PsiClass resolved = type.resolve();
            if (resolved != null && resolved.getQualifiedName().equals(JvmStdlibNames.JET_OBJECT.getFqName())) {
                continue;
            }
            
668
            JetType transform = semanticServices.getTypeTransformer().transformToType(type, typeVariableResolver);
669 670 671 672 673

            result.add(TypeUtils.makeNotNullable(transform));
        }
    }

674
    public NamespaceDescriptor resolveNamespace(String qualifiedName) {
675 676 677 678 679 680
        // First, let's check that there is no Kotlin package:
        NamespaceDescriptor kotlinNamespaceDescriptor = semanticServices.getKotlinNamespaceDescriptor(qualifiedName);
        if (kotlinNamespaceDescriptor != null) {
            return kotlinNamespaceDescriptor;
        }

681
        PsiPackage psiPackage = findPackage(qualifiedName);
682
        if (psiPackage == null) {
683
            PsiClass psiClass = findClass(qualifiedName);
A
Andrey Breslav 已提交
684 685
            if (psiClass == null) return null;
            return resolveNamespace(psiClass);
686 687 688 689
        }
        return resolveNamespace(psiPackage);
    }

690
    public PsiClass findClass(String qualifiedName) {
691
        PsiClass original = javaFacade.findClass(qualifiedName, javaSearchScope);
M
Maxim Shafirov 已提交
692
        PsiClass altClass = altClassFinder.findClass(qualifiedName);
693 694 695 696 697 698 699 700
        if (altClass != null) {
            if (altClass instanceof ClsClassImpl) {
                altClass.putUserData(ClsClassImpl.DELEGATE_KEY, original);
            }

            return altClass;
        }
        return original;
701 702
    }

703
    /*package*/ PsiPackage findPackage(String qualifiedName) {
704 705 706
        return javaFacade.findPackage(qualifiedName);
    }

707
    private NamespaceDescriptor resolveNamespace(@NotNull PsiPackage psiPackage) {
708 709 710 711 712
        ResolverNamespaceData namespaceData = namespaceDescriptorCache.get(psiPackage);
        if (namespaceData == null) {
            namespaceData = createJavaNamespaceDescriptor(psiPackage);
            namespaceDescriptorCache.put(psiPackage, namespaceData);
            namespaceDescriptorCacheByFqn.put(psiPackage.getQualifiedName(), namespaceData);
713
        }
714
        return namespaceData.namespaceDescriptor;
715 716
    }

A
Andrey Breslav 已提交
717
    private NamespaceDescriptor resolveNamespace(@NotNull PsiClass psiClass) {
718 719 720 721 722
        ResolverNamespaceData namespaceData = namespaceDescriptorCache.get(psiClass);
        if (namespaceData == null) {
            namespaceData = createJavaNamespaceDescriptor(psiClass);
            namespaceDescriptorCache.put(psiClass, namespaceData);
            namespaceDescriptorCacheByFqn.put(psiClass.getQualifiedName(), namespaceData);
A
Andrey Breslav 已提交
723
        }
724
        return namespaceData.namespaceDescriptor;
A
Andrey Breslav 已提交
725 726
    }

727 728
    private ResolverNamespaceData createJavaNamespaceDescriptor(@NotNull PsiPackage psiPackage) {
        ResolverNamespaceData namespaceData = new ResolverNamespaceData();
729
        String name = psiPackage.getName();
730
        namespaceData.namespaceDescriptor = new JavaNamespaceDescriptor(
731
                resolveParentDescriptor(psiPackage),
A
Andrey Breslav 已提交
732
                Collections.<AnnotationDescriptor>emptyList(), // TODO
733
                name == null ? JAVA_ROOT : name,
734 735
                name == null ? JAVA_ROOT : psiPackage.getQualifiedName(),
                true
736
        );
737

738 739 740 741 742
        namespaceData.namespaceDescriptor.setMemberScope(new JavaPackageScope(psiPackage.getQualifiedName(), namespaceData.namespaceDescriptor, semanticServices));
        semanticServices.getTrace().record(BindingContext.NAMESPACE, psiPackage, namespaceData.namespaceDescriptor);
        // TODO: hack
        namespaceData.kotlin = true;
        return namespaceData;
743 744
    }

745 746 747 748 749 750 751 752
    private DeclarationDescriptor resolveParentDescriptor(@NotNull PsiPackage psiPackage) {
        PsiPackage parentPackage = psiPackage.getParentPackage();
        if (parentPackage == null) {
            return null;
        }
        return resolveNamespace(parentPackage);
    }

753 754 755
    private ResolverNamespaceData createJavaNamespaceDescriptor(@NotNull final PsiClass psiClass) {
        ResolverNamespaceData namespaceData = new ResolverNamespaceData();
        namespaceData.namespaceDescriptor = new JavaNamespaceDescriptor(
756
                resolveParentDescriptor(psiClass),
A
Andrey Breslav 已提交
757
                Collections.<AnnotationDescriptor>emptyList(), // TODO
758
                psiClass.getName(),
759 760
                psiClass.getQualifiedName(),
                false
761
        );
762 763 764
        namespaceData.namespaceDescriptor.setMemberScope(new JavaClassMembersScope(namespaceData.namespaceDescriptor, psiClass, semanticServices, true));
        semanticServices.getTrace().record(BindingContext.NAMESPACE, psiClass, namespaceData.namespaceDescriptor);
        return namespaceData;
765
    }
766 767 768 769 770 771 772 773 774 775
    
    private static class ValueParameterDescriptors {
        private final JetType receiverType;
        private final List<ValueParameterDescriptor> descriptors;

        private ValueParameterDescriptors(@Nullable JetType receiverType, List<ValueParameterDescriptor> descriptors) {
            this.receiverType = receiverType;
            this.descriptors = descriptors;
        }
    }
776

777 778
    private ValueParameterDescriptors resolveParameterDescriptors(DeclarationDescriptor containingDeclaration,
            List<PsiParameterWrapper> parameters, TypeVariableResolver typeVariableResolver) {
779
        List<ValueParameterDescriptor> result = new ArrayList<ValueParameterDescriptor>();
780
        JetType receiverType = null;
781
        int indexDelta = 0;
782 783
        for (int i = 0, parametersLength = parameters.size(); i < parametersLength; i++) {
            PsiParameterWrapper parameter = parameters.get(i);
784
            JvmMethodParameterMeaning meaning = resolveParameterDescriptor(containingDeclaration, i + indexDelta, parameter, typeVariableResolver);
785 786
            if (meaning.kind == JvmMethodParameterKind.TYPE_INFO) {
                // TODO
787
                --indexDelta;
788 789 790 791 792 793
            } else if (meaning.kind == JvmMethodParameterKind.REGULAR) {
                result.add(meaning.valueParameterDescriptor);
            } else if (meaning.kind == JvmMethodParameterKind.RECEIVER) {
                if (receiverType != null) {
                    throw new IllegalStateException("more then one receiver");
                }
794
                --indexDelta;
795
                receiverType = meaning.receiverType;
S
Stepan Koltsov 已提交
796
            }
797
        }
798
        return new ValueParameterDescriptors(receiverType, result);
799
    }
A
Andrey Breslav 已提交
800

801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833
    private enum JvmMethodParameterKind {
        REGULAR,
        RECEIVER,
        TYPE_INFO,
    }
    
    private static class JvmMethodParameterMeaning {
        private final JvmMethodParameterKind kind;
        private final JetType receiverType;
        private final ValueParameterDescriptor valueParameterDescriptor;
        private final Object typeInfo;

        private JvmMethodParameterMeaning(JvmMethodParameterKind kind, JetType receiverType, ValueParameterDescriptor valueParameterDescriptor, Object typeInfo) {
            this.kind = kind;
            this.receiverType = receiverType;
            this.valueParameterDescriptor = valueParameterDescriptor;
            this.typeInfo = typeInfo;
        }
        
        public static JvmMethodParameterMeaning receiver(@NotNull JetType receiverType) {
            return new JvmMethodParameterMeaning(JvmMethodParameterKind.RECEIVER, receiverType, null, null);
        }
        
        public static JvmMethodParameterMeaning regular(@NotNull ValueParameterDescriptor valueParameterDescriptor) {
            return new JvmMethodParameterMeaning(JvmMethodParameterKind.REGULAR, null, valueParameterDescriptor, null);
        }
        
        public static JvmMethodParameterMeaning typeInfo(@NotNull Object typeInfo) {
            return new JvmMethodParameterMeaning(JvmMethodParameterKind.TYPE_INFO, null, null, typeInfo);
        }
    }

    @NotNull
834
    private JvmMethodParameterMeaning resolveParameterDescriptor(DeclarationDescriptor containingDeclaration, int i,
835 836 837 838 839 840 841
            PsiParameterWrapper parameter, TypeVariableResolver typeVariableResolver) {

        if (parameter.getJetTypeParameter().isDefined()) {
            return JvmMethodParameterMeaning.typeInfo(new Object());
        }

        PsiType psiType = parameter.getPsiParameter().getType();
842

843
        boolean nullable = parameter.getJetValueParameter().nullable();
844

845 846
        // TODO: must be very slow, make it lazy?
        String name = parameter.getPsiParameter().getName() != null ? parameter.getPsiParameter().getName() : "p" + i;
847

848 849
        if (parameter.getJetValueParameter().name().length() > 0) {
            name = parameter.getJetValueParameter().name();
850 851
        }
        
852 853 854 855
        String typeFromAnnotation = parameter.getJetValueParameter().type();
        boolean receiver = parameter.getJetValueParameter().receiver();
        boolean hasDefaultValue = parameter.getJetValueParameter().hasDefaultValue();

S
Stepan Koltsov 已提交
856
        JetType outType;
857
        if (typeFromAnnotation.length() > 0) {
858
            outType = semanticServices.getTypeTransformer().transformToType(typeFromAnnotation, typeVariableResolver);
S
Stepan Koltsov 已提交
859
        } else {
860
            outType = semanticServices.getTypeTransformer().transformToType(psiType, typeVariableResolver);
S
Stepan Koltsov 已提交
861
        }
862 863 864 865 866 867 868 869

        JetType varargElementType;
        if (psiType instanceof PsiEllipsisType) {
            varargElementType = semanticServices.getJetSemanticServices().getStandardLibrary().getArrayElementType(outType);
        } else {
            varargElementType = null;
        }

870 871 872 873 874 875 876 877
        if (receiver) {
            return JvmMethodParameterMeaning.receiver(outType);
        } else {
            return JvmMethodParameterMeaning.regular(new ValueParameterDescriptorImpl(
                    containingDeclaration,
                    i,
                    Collections.<AnnotationDescriptor>emptyList(), // TODO
                    name,
S
Stepan Koltsov 已提交
878
                    false,
879
                    nullable ? TypeUtils.makeNullableAsSpecified(outType, nullable) : outType,
880
                    hasDefaultValue,
881 882 883
                    varargElementType
            ));
        }
884 885
    }

886
    public Set<VariableDescriptor> resolveFieldGroupByName(@NotNull ClassOrNamespaceDescriptor owner, PsiClass psiClass, String fieldName, boolean staticMembers) {
887
        ResolverScopeData scopeData = getResolverScopeData(owner, new PsiClassWrapper(psiClass));
888

889 890 891
        NamedMembers namedMembers = scopeData.namedMembersMap.get(fieldName);
        if (namedMembers == null) {
            return Collections.emptySet();
892 893
        }

894
        resolveNamedGroupProperties(owner, scopeData, staticMembers, namedMembers, fieldName);
895

896 897 898 899
        return namedMembers.propertyDescriptors;
    }
    
    @NotNull
900
    public Set<VariableDescriptor> resolveFieldGroup(@NotNull ClassOrNamespaceDescriptor owner, PsiClass psiClass, boolean staticMembers) {
901

902 903 904 905 906 907
        ResolverScopeData scopeData = getResolverScopeData(owner, new PsiClassWrapper(psiClass));
        
        Set<VariableDescriptor> descriptors = Sets.newHashSet();
        Map<String, NamedMembers> membersForProperties = scopeData.namedMembersMap;
        for (Map.Entry<String, NamedMembers> entry : membersForProperties.entrySet()) {
            NamedMembers namedMembers = entry.getValue();
908
            if (namedMembers.propertyAccessors == null) {
909 910 911 912
                continue;
            }
            
            String propertyName = entry.getKey();
913

914
            resolveNamedGroupProperties(owner, scopeData, staticMembers, namedMembers, propertyName);
915
            descriptors.addAll(namedMembers.propertyDescriptors);
916
        }
917
        return descriptors;
918
    }
919 920 921 922 923 924 925
    
    private Object key(TypeSource typeSource) {
        if (typeSource == null) {
            return "";
        } else if (typeSource.getTypeString().length() > 0) {
            return typeSource.getTypeString();
        } else {
926
            return psiTypeToKey(typeSource.getPsiType());
927 928
        }
    }
929 930 931 932 933 934 935 936 937 938 939 940 941

    private Object psiTypeToKey(PsiType psiType) {
        if (psiType instanceof PsiClassType) {
            return ((PsiClassType) psiType).getClassName();
        } else if (psiType instanceof PsiPrimitiveType) {
            return psiType.getPresentableText();
        } else if (psiType instanceof PsiArrayType) {
            return Pair.create("[", psiTypeToKey(((PsiArrayType) psiType).getComponentType()));
        } else {
            throw new IllegalStateException("" + psiType.getClass());
        }
    }

942 943 944 945 946
    private Object propertyKeyForGrouping(PropertyAccessorData propertyAccessor) {
        Object type = key(propertyAccessor.getType());
        Object receiverType = key(propertyAccessor.getReceiverType());
        return Pair.create(type, receiverType);
    }
947

948 949 950 951
    private void resolveNamedGroupProperties(
            @NotNull ClassOrNamespaceDescriptor owner,
            @NotNull ResolverScopeData scopeData,
            boolean staticMembers, NamedMembers namedMembers, String propertyName) {
952 953 954 955
        if (namedMembers.propertyDescriptors != null) {
            return;
        }
        
956
        if (namedMembers.propertyAccessors == null) {
957 958 959
            namedMembers.propertyDescriptors = Collections.emptySet();
            return;
        }
960 961 962 963

        final List<TypeParameterDescriptorInitialization> classTypeParameterDescriptorInitialization;
        if (scopeData instanceof ResolverBinaryClassData) {
            classTypeParameterDescriptorInitialization = ((ResolverBinaryClassData) scopeData).typeParameters;
964
        } else {
965
            classTypeParameterDescriptorInitialization = new ArrayList<TypeParameterDescriptorInitialization>(0);
966
        }
967

968 969
        TypeVariableResolver typeVariableResolver = new TypeVariableResoverFromTypeDescriptorsInitialization(classTypeParameterDescriptorInitialization, null);

970 971 972 973
        class GroupingValue {
            PropertyAccessorData getter;
            PropertyAccessorData setter;
            PropertyAccessorData field;
974
        }
975 976
        
        Map<Object, GroupingValue> map = new HashMap<Object, GroupingValue>();
977

978
        for (PropertyAccessorData propertyAccessor : namedMembers.propertyAccessors) {
979

980 981 982 983 984 985 986
            Object key = propertyKeyForGrouping(propertyAccessor);
            
            GroupingValue value = map.get(key);
            if (value == null) {
                value = new GroupingValue();
                map.put(key, value);
            }
987

988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
            if (propertyAccessor.isGetter()) {
                if (value.getter != null) {
                    throw new IllegalStateException("oops, duplicate key");
                }
                value.getter = propertyAccessor;
            } else if (propertyAccessor.isSetter()) {
                if (value.setter != null) {
                    throw new IllegalStateException("oops, duplicate key");
                }
                value.setter = propertyAccessor;
            } else if (propertyAccessor.isField()) {
                if (value.field != null) {
                    throw new IllegalStateException("oops, duplicate key");
                }
                value.field = propertyAccessor;
            } else {
                throw new IllegalStateException();
            }
1006
        }
1007

1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021
        
        Set<VariableDescriptor> r = new HashSet<VariableDescriptor>();
        
        for (GroupingValue members : map.values()) {
            boolean isFinal;
            if (members.setter == null && members.getter == null) {
                isFinal = false;
            } else if (members.getter != null) {
                isFinal = members.getter.getMember().isFinal();
            } else if (members.setter != null) {
                isFinal = members.setter.getMember().isFinal();
            } else {
                isFinal = false;
            }
1022

1023 1024 1025 1026 1027 1028 1029 1030 1031 1032
            PropertyAccessorData anyMember;
            if (members.getter != null) {
                anyMember = members.getter;
            } else if (members.field != null) {
                anyMember = members.field;
            } else if (members.setter != null) {
                anyMember = members.setter;
            } else {
                throw new IllegalStateException();
            }
1033

1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047
            boolean isVar;
            if (members.getter == null && members.setter == null) {
                isVar = !members.field.getMember().isFinal();
            } else {
                isVar = members.setter != null;
            }
            
            PropertyDescriptor propertyDescriptor = new PropertyDescriptor(
                    owner,
                    Collections.<AnnotationDescriptor>emptyList(),
                    isFinal && !staticMembers ? Modality.FINAL : Modality.OPEN, // TODO: abstract
                    resolveVisibilityFromPsiModifiers(anyMember.getMember().psiMember),
                    isVar,
                    false,
1048 1049
                    propertyName,
                    CallableMemberDescriptor.Kind.DECLARATION);
1050

1051 1052 1053
            PropertyGetterDescriptor getterDescriptor = null;
            PropertySetterDescriptor setterDescriptor = null;
            if (members.getter != null) {
1054
                getterDescriptor = new PropertyGetterDescriptor(propertyDescriptor, Collections.<AnnotationDescriptor>emptyList(), Modality.OPEN, Visibility.PUBLIC, true, false, CallableMemberDescriptor.Kind.DECLARATION);
1055 1056
            }
            if (members.setter != null) {
1057
                setterDescriptor = new PropertySetterDescriptor(propertyDescriptor, Collections.<AnnotationDescriptor>emptyList(), Modality.OPEN, Visibility.PUBLIC, true, false, CallableMemberDescriptor.Kind.DECLARATION);
1058
            }
1059

1060
            propertyDescriptor.initialize(getterDescriptor, setterDescriptor);
1061

1062
            List<TypeParameterDescriptorInitialization> typeParametersInitialization = new ArrayList<TypeParameterDescriptorInitialization>(0);
1063 1064 1065

            if (members.setter != null) {
                PsiMethodWrapper method = (PsiMethodWrapper) members.setter.getMember();
1066

1067
                if (anyMember == members.setter) {
1068
                    typeParametersInitialization = resolveMethodTypeParameters(method, setterDescriptor, typeVariableResolver);
1069 1070 1071 1072 1073 1074
                }
            }
            if (members.getter != null) {
                PsiMethodWrapper method = (PsiMethodWrapper) members.getter.getMember();

                if (anyMember == members.getter) {
1075
                    typeParametersInitialization = resolveMethodTypeParameters(method, getterDescriptor, typeVariableResolver);
1076 1077 1078
                }
            }

1079 1080 1081 1082 1083 1084 1085 1086 1087 1088
            List<TypeParameterDescriptor> typeParameters = new ArrayList<TypeParameterDescriptor>();
            for (TypeParameterDescriptorInitialization typeParameter : typeParametersInitialization) {
                typeParameters.add(typeParameter.descriptor);
            }

            List<TypeParameterDescriptorInitialization> typeParametersForReceiver = new ArrayList<TypeParameterDescriptorInitialization>();
            typeParametersForReceiver.addAll(classTypeParameterDescriptorInitialization);
            typeParametersForReceiver.addAll(typeParametersInitialization);
            TypeVariableResolver typeVariableResolverForPropertyInternals = new TypeVariableResoverFromTypeDescriptorsInitialization(typeParametersForReceiver, null);

1089 1090 1091 1092
            JetType propertyType;
            if (anyMember.getType().getTypeString().length() > 0) {
                propertyType = semanticServices.getTypeTransformer().transformToType(anyMember.getType().getTypeString(), typeVariableResolverForPropertyInternals);
            } else {
1093
                propertyType = semanticServices.getTypeTransformer().transformToType(anyMember.getType().getPsiType(), typeVariableResolverForPropertyInternals);
1094 1095 1096 1097 1098 1099 1100 1101
            }
            
            JetType receiverType;
            if (anyMember.getReceiverType() == null) {
                receiverType = null;
            } else if (anyMember.getReceiverType().getTypeString().length() > 0) {
                receiverType = semanticServices.getTypeTransformer().transformToType(anyMember.getReceiverType().getTypeString(), typeVariableResolverForPropertyInternals);
            } else {
1102
                receiverType = semanticServices.getTypeTransformer().transformToType(anyMember.getReceiverType().getPsiType(), typeVariableResolverForPropertyInternals);
1103 1104 1105 1106 1107 1108 1109
            }

            propertyDescriptor.setType(
                    propertyType,
                    typeParameters,
                    DescriptorUtils.getExpectedThisObjectIfNeeded(owner),
                    receiverType
1110
            );
1111 1112 1113 1114
            if (getterDescriptor != null) {
                getterDescriptor.initialize(propertyType);
            }
            if (setterDescriptor != null) {
1115
                setterDescriptor.initialize(new ValueParameterDescriptorImpl(setterDescriptor, 0, Collections.<AnnotationDescriptor>emptyList(), "p0"/*TODO*/, false, propertyDescriptor.getOutType(), false, null));
1116 1117 1118 1119 1120
            }

            semanticServices.getTrace().record(BindingContext.VARIABLE, anyMember.getMember().psiMember, propertyDescriptor);
            
            r.add(propertyDescriptor);
1121
        }
1122

1123
        namedMembers.propertyDescriptors = r;
1124
    }
1125

1126
    private void resolveNamedGroupFunctions(ClassOrNamespaceDescriptor owner, PsiClass psiClass, TypeSubstitutor typeSubstitutorForGenericSuperclasses, NamedMembers namedMembers) {
1127 1128 1129
        if (namedMembers.functionDescriptors != null) {
            return;
        }
1130

1131 1132 1133
        if (namedMembers.methods == null) {
            namedMembers.functionDescriptors = Collections.emptySet();
            return;
1134
        }
1135 1136 1137

        Set<FunctionDescriptor> functionDescriptors = new HashSet<FunctionDescriptor>(namedMembers.methods.size());
        for (PsiMethodWrapper method : namedMembers.methods) {
1138 1139 1140 1141
            FunctionDescriptor function = resolveMethodToFunctionDescriptor(owner, psiClass, typeSubstitutorForGenericSuperclasses, method);
            if (function != null) {
                functionDescriptors.add(function);
            }
1142
        }
1143
        namedMembers.functionDescriptors = functionDescriptors;
1144 1145
    }

1146
    private ResolverScopeData getResolverScopeData(ClassOrNamespaceDescriptor owner, PsiClassWrapper psiClass) {
1147
        ResolverScopeData scopeData;
1148
        boolean staticMembers;
1149 1150
        if (owner instanceof JavaNamespaceDescriptor) {
            scopeData = namespaceDescriptorCacheByFqn.get(((JavaNamespaceDescriptor) owner).getQualifiedName());
1151
            staticMembers = true;
1152
        } else if (owner instanceof ClassDescriptor) {
1153
            scopeData = classDescriptorCache.get(psiClass.getQualifiedName());
1154
            staticMembers = false;
1155 1156 1157 1158 1159 1160 1161
        } else {
            throw new IllegalStateException();
        }
        if (scopeData == null) {
            throw new IllegalStateException();
        }
        
1162 1163
        if (scopeData.namedMembersMap == null) {
            scopeData.namedMembersMap = JavaDescriptorResolverHelper.getNamedMembers(psiClass, staticMembers, scopeData.kotlin);
1164 1165
        }
        
1166
        return scopeData;
1167
    }
A
Andrey Breslav 已提交
1168

A
Andrey Breslav 已提交
1169
    @NotNull
1170
    public Set<FunctionDescriptor> resolveFunctionGroup(@NotNull ClassOrNamespaceDescriptor descriptor, @NotNull PsiClass psiClass, @NotNull String methodName, boolean staticMembers) {
A
Andrey Breslav 已提交
1171

1172
        ResolverScopeData resolverScopeData = getResolverScopeData(descriptor, new PsiClassWrapper(psiClass));
A
Andrey Breslav 已提交
1173

1174 1175 1176 1177 1178
        Map<String, NamedMembers> namedMembersMap = resolverScopeData.namedMembersMap;

        NamedMembers namedMembers = namedMembersMap.get(methodName);
        if (namedMembers == null || namedMembers.methods == null) {
            return Collections.emptySet();
1179
        }
1180

1181 1182 1183 1184 1185 1186
        TypeSubstitutor typeSubstitutor;
        if (descriptor instanceof ClassDescriptor && !staticMembers) {
            typeSubstitutor = createSubstitutorForGenericSupertypes((ClassDescriptor) descriptor);
        } else {
            typeSubstitutor = TypeSubstitutor.EMPTY;
        }
1187
        resolveNamedGroupFunctions(descriptor, psiClass, typeSubstitutor, namedMembers);
1188 1189
        
        return namedMembers.functionDescriptors;
1190 1191
    }

1192
    private TypeSubstitutor createSubstitutorForGenericSupertypes(@Nullable ClassDescriptor classDescriptor) {
A
Andrey Breslav 已提交
1193 1194 1195 1196 1197 1198 1199 1200 1201 1202
        TypeSubstitutor typeSubstitutor;
        if (classDescriptor != null) {
            typeSubstitutor = TypeUtils.buildDeepSubstitutor(classDescriptor.getDefaultType());
        }
        else {
            typeSubstitutor = TypeSubstitutor.EMPTY;
        }
        return typeSubstitutor;
    }

1203 1204 1205
    // this method won't be necessary as soon as we resolve only local methods
    private void getAllTypeParameterDescriptorInitialization(PsiClass psiClass, List<TypeParameterDescriptorInitialization> dest) {
        ResolverClassData classData = resolveClassData(psiClass);
1206

1207 1208 1209
        if (classData instanceof ResolverSrcClassData) {
            // TODO hack
            return;
1210 1211
        }

1212 1213 1214 1215 1216 1217 1218 1219 1220 1221
        ResolverBinaryClassData binaryClassData = (ResolverBinaryClassData) classData;
        if (binaryClassData == null) {
            return;
        }
        if (binaryClassData.typeParameters == null) {
            throw new RuntimeException();
        }
        dest.addAll(binaryClassData.typeParameters);
        for (PsiClass supr : psiClass.getSupers()) {
            getAllTypeParameterDescriptorInitialization(supr, dest);
1222 1223
        }
    }
1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258
    
    private static boolean equal(@NotNull PsiClass c1, @NotNull PsiClass c2) {
        return c1.getQualifiedName().equals(c2.getQualifiedName());
    }
    
    private static boolean equal(@NotNull PsiMethod m1, @NotNull PsiMethod m2) {
        // TODO dummy
        return m1.getName().equals(m2.getName()) && equal(m1.getContainingClass(), m2.getContainingClass());
    }

    private static boolean equal(@NotNull PsiTypeParameterListOwner o1, @NotNull PsiTypeParameterListOwner o2) {
        if (o1 == o2) {
            return true;
        }
        if (o1 instanceof PsiClass && o2 instanceof PsiClass) {
            return equal((PsiClass) o1, (PsiClass) o2);
        }
        if (o1 instanceof PsiMethod && o2 instanceof PsiMethod) {
            return equal((PsiMethod) o1, (PsiMethod) o2);
        }
        if ((o1 instanceof PsiClass || o1 instanceof PsiMethod) && (o2 instanceof PsiClass || o2 instanceof PsiMethod)) {
            return false;
        }
        throw new IllegalStateException(o1.getClass() + ", " + o2.getClass());
    }
    
    public static boolean equal(@NotNull PsiTypeParameter p1, @NotNull PsiTypeParameter p2) {
        if (p1 == p2) {
            return true;
        }
        if (p1.getIndex() != p2.getIndex()) {
            return false;
        }
        return equal(p1.getOwner(), p2.getOwner());
    }
1259

A
Andrey Breslav 已提交
1260
    @Nullable
1261
    private FunctionDescriptor resolveMethodToFunctionDescriptor(ClassOrNamespaceDescriptor owner, final PsiClass psiClass, TypeSubstitutor typeSubstitutorForGenericSuperclasses, final PsiMethodWrapper method) {
1262
        
1263
        PsiType returnType = method.getReturnType();
A
Andrey Breslav 已提交
1264 1265 1266
        if (returnType == null) {
            return null;
        }
1267
        FunctionDescriptor functionDescriptor = methodDescriptorCache.get(method.getPsiMethod());
A
Andrey Breslav 已提交
1268
        if (functionDescriptor != null) {
1269
            if (method.getPsiMethod().getContainingClass() != psiClass) {
A
Andrey Breslav 已提交
1270 1271 1272 1273
                functionDescriptor = functionDescriptor.substitute(typeSubstitutorForGenericSuperclasses);
            }
            return functionDescriptor;
        }
1274

1275 1276
        ResolverScopeData scopeData = getResolverScopeData(owner, new PsiClassWrapper(psiClass));

1277 1278 1279 1280 1281 1282 1283 1284 1285
        boolean kotlin;
        if (owner instanceof JavaNamespaceDescriptor) {
            JavaNamespaceDescriptor javaNamespaceDescriptor = (JavaNamespaceDescriptor) owner;
            ResolverNamespaceData namespaceData = namespaceDescriptorCacheByFqn.get(javaNamespaceDescriptor.getQualifiedName());
            if (namespaceData == null) {
                throw new IllegalStateException("namespaceData not found by name " + javaNamespaceDescriptor.getQualifiedName());
            }
            kotlin = namespaceData.kotlin;
        } else {
1286
            ResolverBinaryClassData classData = classDescriptorCache.get(psiClass.getQualifiedName());
1287 1288 1289 1290 1291 1292
            if (classData == null) {
                throw new IllegalStateException("classData not found by name " + psiClass.getQualifiedName());
            }
            kotlin = classData.kotlin;
        }

1293
        // TODO: ugly
1294
        if (method.getJetMethod().kind() == JvmStdlibNames.JET_METHOD_KIND_PROPERTY) {
1295
            return null;
1296
        }
1297

S
Stepan Koltsov 已提交
1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318
        if (kotlin) {
            // TODO: unless maybe class explicitly extends Object
            String ownerClassName = method.getPsiMethod().getContainingClass().getQualifiedName();
            if (ownerClassName.equals("java.lang.Object")) {
                return null;
            }
            
            if (method.getName().equals(JvmStdlibNames.JET_OBJECT_GET_TYPEINFO_METHOD) && method.getParameters().size() == 0) {
                return null;
            }
            
            if (method.getName().equals(JvmStdlibNames.JET_OBJECT_GET_OUTER_OBJECT_METHOD) && method.getParameters().size() == 0) {
                return null;
            }

            // TODO: check signature
            if (method.getName().equals(JvmAbi.SET_TYPE_INFO_METHOD)) {
                return null;
            }
        }

1319 1320
        DeclarationDescriptor classDescriptor;
        final List<TypeParameterDescriptor> classTypeParameters;
1321 1322
        final List<TypeParameterDescriptorInitialization> classTypeParameterDescriptorsInitialization;
        if (scopeData instanceof ResolverBinaryClassData) {
1323
            ClassDescriptor classClassDescriptor = resolveClass(method.getPsiMethod().getContainingClass());
1324 1325
            classDescriptor = classClassDescriptor;
            classTypeParameters = classClassDescriptor.getTypeConstructor().getParameters();
1326 1327 1328 1329 1330 1331 1332 1333
            classTypeParameterDescriptorsInitialization = new ArrayList<TypeParameterDescriptorInitialization>();
            getAllTypeParameterDescriptorInitialization(psiClass, classTypeParameterDescriptorsInitialization);
            //classTypeParameterDescriptorsInitialization = ((ResolverClassData) scopeData).typeParameters;
        }
        else {
            classDescriptor = resolveNamespace(method.getPsiMethod().getContainingClass());
            classTypeParameters = new ArrayList<TypeParameterDescriptor>(0);
            classTypeParameterDescriptorsInitialization = new ArrayList<TypeParameterDescriptorInitialization>(0);
1334
        }
1335 1336 1337
        if (classDescriptor == null) {
            return null;
        }
S
Stepan Koltsov 已提交
1338
        NamedFunctionDescriptorImpl functionDescriptorImpl = new NamedFunctionDescriptorImpl(
A
Andrey Breslav 已提交
1339 1340
                owner,
                Collections.<AnnotationDescriptor>emptyList(), // TODO
1341 1342
                method.getName(),
                CallableMemberDescriptor.Kind.DECLARATION
A
Andrey Breslav 已提交
1343
        );
1344
        methodDescriptorCache.put(method.getPsiMethod(), functionDescriptorImpl);
1345 1346

        // TODO: add outer classes
1347
        TypeVariableResolver typeVariableResolverForParameters = new TypeVariableResoverFromTypeDescriptorsInitialization(classTypeParameterDescriptorsInitialization, null);
1348

1349 1350 1351 1352 1353
        final List<TypeParameterDescriptorInitialization> methodTypeParametersInitialization = resolveMethodTypeParameters(method, functionDescriptorImpl, typeVariableResolverForParameters);
        List<TypeParameterDescriptor> methodTypeParameters = new ArrayList<TypeParameterDescriptor>();
        for (TypeParameterDescriptorInitialization typeParameterDescriptorInitialization : methodTypeParametersInitialization) {
            methodTypeParameters.add(typeParameterDescriptorInitialization.descriptor);
        }
1354 1355

        class MethodTypeVariableResolver implements TypeVariableResolver {
1356 1357 1358 1359
            @NotNull
            @Override
            public TypeParameterDescriptor getTypeVariable(@NotNull PsiTypeParameter psiTypeParameter) {
                for (TypeParameterDescriptorInitialization typeParameter : methodTypeParametersInitialization) {
1360
                    if (equal(typeParameter.psiTypeParameter, psiTypeParameter)) {
1361 1362 1363 1364
                        return typeParameter.descriptor;
                    }
                }
                for (TypeParameterDescriptorInitialization typeParameter : classTypeParameterDescriptorsInitialization) {
1365
                    if (equal(typeParameter.psiTypeParameter, psiTypeParameter)) {
1366 1367 1368
                        return typeParameter.descriptor;
                    }
                }
1369
                throw new IllegalStateException("unresolved PsiTypeParameter " + psiTypeParameter.getName() + " in method " + method.getName() + " in class " + psiClass.getQualifiedName()); // TODO: report properly
1370
            }
1371

S
Stepan Koltsov 已提交
1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387
            @NotNull
            @Override
            public TypeParameterDescriptor getTypeVariableByPsiByName(@NotNull String name) {
                for (TypeParameterDescriptorInitialization typeParameter : methodTypeParametersInitialization) {
                    if (typeParameter.psiTypeParameter.getName().equals(name)) {
                        return typeParameter.descriptor;
                    }
                }
                for (TypeParameterDescriptorInitialization typeParameter : classTypeParameterDescriptorsInitialization) {
                    if (typeParameter.psiTypeParameter.getName().equals(name)) {
                        return typeParameter.descriptor;
                    }
                }
                throw new IllegalStateException("unresolved PsiTypeParameter " + name + " in method " + method.getName() + " in class " + psiClass.getQualifiedName()); // TODO: report properly
            }

1388 1389 1390
            @NotNull
            @Override
            public TypeParameterDescriptor getTypeVariable(@NotNull String name) {
1391 1392 1393
                for (TypeParameterDescriptorInitialization typeParameter : methodTypeParametersInitialization) {
                    if (typeParameter.descriptor.getName().equals(name)) {
                        return typeParameter.descriptor;
1394 1395 1396 1397 1398 1399 1400 1401 1402
                    }
                }
                for (TypeParameterDescriptor typeParameter : classTypeParameters) {
                    if (typeParameter.getName().equals(name)) {
                        return typeParameter;
                    }
                }
                throw new IllegalStateException("unresolver variable: " + name); // TODO: report properly
            }
1403

1404 1405 1406
        }


1407
        ValueParameterDescriptors valueParameterDescriptors = resolveParameterDescriptors(functionDescriptorImpl, method.getParameters(), new MethodTypeVariableResolver());
A
Andrey Breslav 已提交
1408
        functionDescriptorImpl.initialize(
1409
                valueParameterDescriptors.receiverType,
A
Andrey Breslav 已提交
1410
                DescriptorUtils.getExpectedThisObjectIfNeeded(classDescriptor),
1411
                methodTypeParameters,
1412
                valueParameterDescriptors.descriptors,
1413
                makeReturnType(returnType, method, new MethodTypeVariableResolver()),
1414 1415
                Modality.convertFromFlags(method.getPsiMethod().hasModifierProperty(PsiModifier.ABSTRACT), !method.isFinal()),
                resolveVisibilityFromPsiModifiers(method.getPsiMethod())
A
Andrey Breslav 已提交
1416
        );
1417
        semanticServices.getTrace().record(BindingContext.FUNCTION, method.getPsiMethod(), functionDescriptorImpl);
A
Andrey Breslav 已提交
1418
        FunctionDescriptor substitutedFunctionDescriptor = functionDescriptorImpl;
1419
        if (method.getPsiMethod().getContainingClass() != psiClass) {
A
Andrey Breslav 已提交
1420 1421 1422 1423
            substitutedFunctionDescriptor = functionDescriptorImpl.substitute(typeSubstitutorForGenericSuperclasses);
        }
        return substitutedFunctionDescriptor;
    }
1424
    
1425
    public List<FunctionDescriptor> resolveMethods(PsiClass psiClass, ClassOrNamespaceDescriptor containingDeclaration) {
1426 1427 1428
        ResolverScopeData scopeData = getResolverScopeData(containingDeclaration, new PsiClassWrapper(psiClass));

        TypeSubstitutor substitutorForGenericSupertypes;
1429 1430
        if (scopeData instanceof ResolverBinaryClassData) {
            substitutorForGenericSupertypes = createSubstitutorForGenericSupertypes(((ResolverBinaryClassData) scopeData).classDescriptor);
1431 1432 1433 1434
        } else {
            substitutorForGenericSupertypes = TypeSubstitutor.EMPTY;
        }

1435
        List<FunctionDescriptor> functions = new ArrayList<FunctionDescriptor>();
1436 1437 1438 1439
        
        for (NamedMembers namedMembers : scopeData.namedMembersMap.values()) {
            resolveNamedGroupFunctions(containingDeclaration, psiClass, substitutorForGenericSupertypes, namedMembers);
            functions.addAll(namedMembers.functionDescriptors);
1440
        }
1441

1442 1443
        return functions;
    }
1444

1445
    private List<TypeParameterDescriptorInitialization> resolveMethodTypeParameters(
1446
            @NotNull PsiMethodWrapper method,
1447
            @NotNull DeclarationDescriptor functionDescriptor,
1448 1449 1450
            @NotNull TypeVariableResolver classTypeVariableResolver
    ) {
        List<TypeParameterDescriptorInitialization> typeParameters;
1451
        if (method.getJetMethod().typeParameters().length() > 0) {
1452
            typeParameters = resolveMethodTypeParametersFromJetSignature(
1453
                    method.getJetMethod().typeParameters(), method.getPsiMethod(), functionDescriptor, classTypeVariableResolver);
1454 1455
        } else {
            typeParameters = makeUninitializedTypeParameters(functionDescriptor, method.getPsiMethod().getTypeParameters());
1456
        }
1457

1458
        initializeTypeParameters(typeParameters, classTypeVariableResolver);
1459 1460
        return typeParameters;
    }
1461 1462

    /**
1463
     * @see #resolveClassTypeParametersFromJetSignature(String, com.intellij.psi.PsiClass, MutableClassDescriptorLite)
1464
     */
1465 1466
    private List<TypeParameterDescriptorInitialization> resolveMethodTypeParametersFromJetSignature(String jetSignature, final PsiMethod method,
            final DeclarationDescriptor functionDescriptor, final TypeVariableByNameResolver classTypeVariableByNameResolver)
1467
    {
1468
        final List<TypeParameterDescriptorInitialization> r = new ArrayList<TypeParameterDescriptorInitialization>();
1469
        
1470
        class MyTypeVariableByNameResolver implements TypeVariableByNameResolver {
1471 1472 1473 1474

            @NotNull
            @Override
            public TypeParameterDescriptor getTypeVariable(@NotNull String name) {
1475 1476 1477
                for (TypeParameterDescriptorInitialization typeParameter : r) {
                    if (typeParameter.descriptor.getName().equals(name)) {
                        return typeParameter.descriptor;
1478 1479
                    }
                }
1480
                return classTypeVariableByNameResolver.getTypeVariable(name);
1481 1482 1483
            }
        }
        
1484
        new JetSignatureReader(jetSignature).acceptFormalTypeParametersOnly(new JetSignatureExceptionsAdapter() {
1485 1486
            private int formalTypeParameterIndex = 0;
            
1487
            @Override
1488
            public JetSignatureVisitor visitFormalTypeParameter(final String name, final TypeInfoVariance variance, boolean reified) {
1489
                
1490
                return new JetSignatureTypeParameterVisitor(functionDescriptor, method, name, reified, formalTypeParameterIndex++, variance, new MyTypeVariableByNameResolver()) {
1491
                    @Override
1492
                    protected void done(TypeParameterDescriptorInitialization typeParameterDescriptor) {
1493
                        r.add(typeParameterDescriptor);
1494 1495
                    }
                };
1496

1497 1498 1499 1500 1501
            }
        });
        return r;
    }

1502 1503
    private JetType makeReturnType(PsiType returnType, PsiMethodWrapper method,
            @NotNull TypeVariableResolver typeVariableResolver) {
1504 1505 1506

        String returnTypeFromAnnotation = method.getJetMethod().returnType();

S
Stepan Koltsov 已提交
1507
        JetType transformedType;
1508
        if (returnTypeFromAnnotation.length() > 0) {
1509
            transformedType = semanticServices.getTypeTransformer().transformToType(returnTypeFromAnnotation, typeVariableResolver);
S
Stepan Koltsov 已提交
1510
        } else {
1511
            transformedType = semanticServices.getTypeTransformer().transformToType(returnType, typeVariableResolver);
S
Stepan Koltsov 已提交
1512
        }
1513 1514
        if (method.getJetMethod().returnTypeNullable()) {
            return TypeUtils.makeNullableAsSpecified(transformedType, true);
1515 1516 1517 1518 1519
        } else {
            return transformedType;
        }
    }

1520
    private static Visibility resolveVisibilityFromPsiModifiers(PsiModifierListOwner modifierListOwner) {
1521 1522 1523 1524 1525 1526
        //TODO report error
        return modifierListOwner.hasModifierProperty(PsiModifier.PUBLIC) ? Visibility.PUBLIC :
                                        (modifierListOwner.hasModifierProperty(PsiModifier.PRIVATE) ? Visibility.PRIVATE :
                                        (modifierListOwner.hasModifierProperty(PsiModifier.PROTECTED) ? Visibility.PROTECTED : Visibility.INTERNAL));
    }

1527 1528 1529 1530
    public List<ClassDescriptor> resolveInnerClasses(DeclarationDescriptor owner, PsiClass psiClass, boolean staticMembers) {
        PsiClass[] innerPsiClasses = psiClass.getInnerClasses();
        List<ClassDescriptor> r = new ArrayList<ClassDescriptor>(innerPsiClasses.length);
        for (PsiClass innerPsiClass : innerPsiClasses) {
1531 1532 1533 1534
            if (innerPsiClass.hasModifierProperty(PsiModifier.PRIVATE)) {
                // TODO: hack against inner classes
                continue;
            }
1535 1536 1537 1538
            r.add(resolveClass(innerPsiClass));
        }
        return r;
    }
1539
}