JavaDescriptorResolver.java 71.8 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
/*
 * Copyright 2010-2012 JetBrains s.r.o.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

17 18
package org.jetbrains.jet.lang.resolve.java;

19
import com.google.common.collect.Lists;
A
Andrey Breslav 已提交
20
import com.google.common.collect.Maps;
A
Andrey Breslav 已提交
21
import com.google.common.collect.Sets;
22
import com.intellij.openapi.project.Project;
23
import com.intellij.openapi.util.Pair;
24
import com.intellij.openapi.vfs.VirtualFile;
25
import com.intellij.psi.*;
26
import com.intellij.psi.impl.compiled.ClsClassImpl;
27
import com.intellij.psi.search.DelegatingGlobalSearchScope;
28
import com.intellij.psi.search.GlobalSearchScope;
29
import jet.typeinfo.TypeInfoVariance;
30 31
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
32
import org.jetbrains.jet.lang.descriptors.*;
A
Andrey Breslav 已提交
33
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
34
import org.jetbrains.jet.lang.resolve.BindingContext;
35
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
M
Maxim Shafirov 已提交
36
import org.jetbrains.jet.lang.resolve.java.alt.AltClassFinder;
37
import org.jetbrains.jet.lang.resolve.java.kt.JetClassAnnotation;
38
import org.jetbrains.jet.lang.types.*;
39
import org.jetbrains.jet.plugin.JetFileType;
40
import org.jetbrains.jet.rt.signature.JetSignatureAdapter;
41 42 43
import org.jetbrains.jet.rt.signature.JetSignatureExceptionsAdapter;
import org.jetbrains.jet.rt.signature.JetSignatureReader;
import org.jetbrains.jet.rt.signature.JetSignatureVisitor;
44

45
import java.util.*;
46 47 48 49 50

/**
 * @author abreslav
 */
public class JavaDescriptorResolver {
51 52
    
    public static String JAVA_ROOT = "<java_root>";
53

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

56 57
        @Override
        public DeclarationDescriptor substitute(TypeSubstitutor substitutor) {
58
            throw new UnsupportedOperationException();
59 60
        }

61 62
        @Override
        public <R, D> R accept(DeclarationDescriptorVisitor<R, D> visitor, D data) {
63
            return visitor.visitDeclarationDescriptor(this, data);
64 65 66
        }
    };

A
Andrey Breslav 已提交
67
    /*package*/ static final DeclarationDescriptor JAVA_CLASS_OBJECT = new DeclarationDescriptorImpl(null, Collections.<AnnotationDescriptor>emptyList(), "<java_class_object_emulation>") {
A
Andrey Breslav 已提交
68 69 70
        @NotNull
        @Override
        public DeclarationDescriptor substitute(TypeSubstitutor substitutor) {
71
            throw new UnsupportedOperationException();
A
Andrey Breslav 已提交
72 73 74 75 76 77 78
        }

        @Override
        public <R, D> R accept(DeclarationDescriptorVisitor<R, D> visitor, D data) {
            return visitor.visitDeclarationDescriptor(this, data);
        }
    };
79 80 81 82 83 84
    
    private enum TypeParameterDescriptorOrigin {
        JAVA,
        KOTLIN,
    }
    
85 86
    public static class TypeParameterDescriptorInitialization {
        @NotNull
87
        private final TypeParameterDescriptorOrigin origin;
88 89 90
        @NotNull
        final TypeParameterDescriptor descriptor;
        final PsiTypeParameter psiTypeParameter;
91 92 93 94
        @Nullable
        private final List<JetType> upperBoundsForKotlin;
        @Nullable
        private final List<JetType> lowerBoundsForKotlin;
95

96
        private TypeParameterDescriptorInitialization(@NotNull TypeParameterDescriptor descriptor, @NotNull PsiTypeParameter psiTypeParameter) {
97
            this.origin = TypeParameterDescriptorOrigin.JAVA;
98
            this.descriptor = descriptor;
99
            this.psiTypeParameter = psiTypeParameter;
100 101 102 103
            this.upperBoundsForKotlin = null;
            this.lowerBoundsForKotlin = null;
        }

104
        private TypeParameterDescriptorInitialization(@NotNull TypeParameterDescriptor descriptor, @NotNull PsiTypeParameter psiTypeParameter,
105 106 107
                List<JetType> upperBoundsForKotlin, List<JetType> lowerBoundsForKotlin) {
            this.origin = TypeParameterDescriptorOrigin.KOTLIN;
            this.descriptor = descriptor;
108
            this.psiTypeParameter = psiTypeParameter;
109 110
            this.upperBoundsForKotlin = upperBoundsForKotlin;
            this.lowerBoundsForKotlin = lowerBoundsForKotlin;
111 112
        }
    }
113 114


115
    private static abstract class ResolverScopeData {
116
        protected boolean kotlin;
117 118
        
        private Map<String, NamedMembers> namedMembersMap;
119
    }
A
Andrey Breslav 已提交
120

121 122 123 124 125 126
    static abstract class ResolverClassData extends ResolverScopeData {

        @NotNull
        public abstract ClassDescriptor getClassDescriptor();
    }

127
    /** Class with instance members */
128 129 130 131 132
    static class ResolverBinaryClassData extends ResolverClassData {

        ResolverBinaryClassData() {
        }

133
        private MutableClassDescriptorLite classDescriptor;
134

135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152
        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
153 154 155 156 157 158
        @NotNull
        public ClassDescriptor getClassDescriptor() {
            return classDescriptor;
        }
    }

159
    /** Either package or class with static members */
160
    private static class ResolverNamespaceData extends ResolverScopeData {
161 162 163 164 165 166 167 168
        private JavaNamespaceDescriptor namespaceDescriptor;

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

169
    protected final Map<String, ResolverBinaryClassData> classDescriptorCache = Maps.newHashMap();
170 171 172
    protected final Map<String, ResolverNamespaceData> namespaceDescriptorCacheByFqn = Maps.newHashMap();
    protected final Map<PsiElement, ResolverNamespaceData> namespaceDescriptorCache = Maps.newHashMap();

A
Andrey Breslav 已提交
173
    protected final Map<PsiMethod, FunctionDescriptor> methodDescriptorCache = Maps.newHashMap();
174 175 176
    protected final JavaPsiFacade javaFacade;
    protected final GlobalSearchScope javaSearchScope;
    protected final JavaSemanticServices semanticServices;
M
Maxim Shafirov 已提交
177
    private final AltClassFinder altClassFinder;
178 179 180

    public JavaDescriptorResolver(Project project, JavaSemanticServices semanticServices) {
        this.javaFacade = JavaPsiFacade.getInstance(project);
181 182 183 184 185 186
        this.javaSearchScope = new DelegatingGlobalSearchScope(GlobalSearchScope.allScope(project)) {
            @Override
            public boolean contains(VirtualFile file) {
                return myBaseScope.contains(file) && file.getFileType() != JetFileType.INSTANCE;
            }
        };
187
        this.semanticServices = semanticServices;
M
Maxim Shafirov 已提交
188
        altClassFinder = new AltClassFinder(project);
189
    }
190
    
191
    @Nullable
192
    ResolverClassData resolveClassData(@NotNull PsiClass psiClass) {
193
        String qualifiedName = psiClass.getQualifiedName();
194

195 196 197 198
        if (qualifiedName.endsWith(JvmAbi.TRAIT_IMPL_SUFFIX)) {
            // TODO: only if -$$TImpl class is created by Kotlin
            return null;
        }
199

200
        // First, let's check that this is a real Java class, not a Java's view on a Kotlin class:
201 202
        ClassDescriptor kotlinClassDescriptor = semanticServices.getKotlinClassDescriptor(qualifiedName);
        if (kotlinClassDescriptor != null) {
203
            return new ResolverSrcClassData(kotlinClassDescriptor);
204 205
        }

206
        // Not let's take a descriptor of a Java class
207
        ResolverBinaryClassData classData = classDescriptorCache.get(qualifiedName);
208 209 210
        if (classData == null) {
            classData = createJavaClassDescriptor(psiClass);
            classDescriptorCache.put(qualifiedName, classData);
211
        }
212 213 214 215 216 217 218 219 220 221 222
        return classData;
    }

    @Nullable
    public ClassDescriptor resolveClass(@NotNull PsiClass psiClass) {
        ResolverClassData classData = resolveClassData(psiClass);
        if (classData != null) {
            return classData.getClassDescriptor();
        } else {
            return null;
        }
223 224 225 226
    }

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

228 229 230 231 232
        if (qualifiedName.endsWith(JvmAbi.TRAIT_IMPL_SUFFIX)) {
            // TODO: only if -$$TImpl class is created by Kotlin
            return null;
        }
        
233
        // First, let's check that this is a real Java class, not a Java's view on a Kotlin class:
234 235 236 237 238
        ClassDescriptor kotlinClassDescriptor = semanticServices.getKotlinClassDescriptor(qualifiedName);
        if (kotlinClassDescriptor != null) {
            return kotlinClassDescriptor;
        }

239
        // Not let's take a descriptor of a Java class
240
        ResolverBinaryClassData classData = classDescriptorCache.get(qualifiedName);
241
        if (classData == null) {
242
            PsiClass psiClass = findClass(qualifiedName);
243 244 245
            if (psiClass == null) {
                return null;
            }
246
            classData = createJavaClassDescriptor(psiClass);
247
        }
248
        return classData.getClassDescriptor();
249 250
    }

251
    private ResolverBinaryClassData createJavaClassDescriptor(@NotNull final PsiClass psiClass) {
A
Andrey Breslav 已提交
252 253 254
        assert !classDescriptorCache.containsKey(psiClass.getQualifiedName()) : psiClass.getQualifiedName();
        classDescriptorCache.put(psiClass.getQualifiedName(), null); // TODO

255
        String name = psiClass.getName();
256
        ResolverBinaryClassData classData = new ResolverBinaryClassData();
257
        ClassKind kind = psiClass.isInterface() ? (psiClass.isAnnotationType() ? ClassKind.ANNOTATION_CLASS : ClassKind.TRAIT) : ClassKind.CLASS;
258 259
        classData.classDescriptor = new MutableClassDescriptorLite(
                resolveParentDescriptor(psiClass), kind
260
        );
261
        classData.classDescriptor.setName(name);
262
        
263
        class OuterClassTypeVariableByNameResolver implements TypeVariableByNameResolver {
264 265 266 267 268 269 270 271

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

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

274 275 276 277 278 279 280
        classData.typeParameters = createUninitializedClassTypeParameters(psiClass, classData, new OuterClassTypeVariableByNameResolver());
        
        List<TypeParameterDescriptor> typeParameters = new ArrayList<TypeParameterDescriptor>();
        for (TypeParameterDescriptorInitialization typeParameter : classData.typeParameters) {
            typeParameters.add(typeParameter.descriptor);
        }
        
281 282 283
        classData.classDescriptor.setTypeParameterDescriptors(typeParameters);
        classData.classDescriptor.setSupertypes(supertypes);
        classData.classDescriptor.setVisibility(resolveVisibilityFromPsiModifiers(psiClass));
284
        classData.classDescriptor.setModality(Modality.convertFromFlags(
285 286
                psiClass.hasModifierProperty(PsiModifier.ABSTRACT) || psiClass.isInterface(),
                !psiClass.hasModifierProperty(PsiModifier.FINAL))
A
Andrey Breslav 已提交
287
        );
288
        classData.classDescriptor.createTypeConstructor();
289
        classDescriptorCache.put(psiClass.getQualifiedName(), classData);
290
        classData.classDescriptor.setScopeForMemberLookup(new JavaClassMembersScope(classData.classDescriptor, psiClass, semanticServices, false));
291

292 293 294
        initializeTypeParameters(classData.typeParameters, new TypeVariableResoverFromTypeDescriptorsInitialization(new ArrayList<TypeParameterDescriptorInitialization>(), null));

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

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

299
        if (psiClass.isInterface()) {
300
            //classData.classDescriptor.setSuperclassType(JetStandardClasses.getAnyType()); // TODO : Make it java.lang.Object
301 302 303 304 305 306
        }
        else {
            PsiClassType[] extendsListTypes = psiClass.getExtendsListTypes();
            assert extendsListTypes.length == 0 || extendsListTypes.length == 1;
            JetType superclassType = extendsListTypes.length == 0
                                            ? JetStandardClasses.getAnyType()
307
                                            : semanticServices.getTypeTransformer().transformToType(extendsListTypes[0], resolverForTypeParameters);
308
            //classData.classDescriptor.setSuperclassType(superclassType);
309
        }
A
Andrey Breslav 已提交
310 311

        PsiMethod[] psiConstructors = psiClass.getConstructors();
312 313

        if (psiConstructors.length == 0) {
A
Andrey Breslav 已提交
314 315 316 317
            // We need to create default constructors for classes and abstract classes.
            // Example:
            // class Kotlin() : Java() {}
            // abstract public class Java {}
318
            if (!psiClass.isInterface()) {
319
                ConstructorDescriptorImpl constructorDescriptor = new ConstructorDescriptorImpl(
320
                        classData.classDescriptor,
A
Andrey Breslav 已提交
321
                        Collections.<AnnotationDescriptor>emptyList(),
322
                        false);
323 324
                constructorDescriptor.initialize(typeParameters, Collections.<ValueParameterDescriptor>emptyList(), Modality.FINAL, classData.classDescriptor.getVisibility());
                constructorDescriptor.setReturnType(classData.classDescriptor.getDefaultType());
325
                classData.classDescriptor.addConstructor(constructorDescriptor, null);
326
                semanticServices.getTrace().record(BindingContext.CONSTRUCTOR, psiClass, constructorDescriptor);
327
            }
328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348
            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)) {
349
                            varargElementType = semanticServices.getTypeTransformer().transformToType(((PsiArrayType) returnType).getComponentType(), resolverForTypeParameters);
350 351 352 353 354 355 356 357
                        }

                        valueParameters.add(new ValueParameterDescriptorImpl(
                                constructorDescriptor,
                                i,
                                Collections.<AnnotationDescriptor>emptyList(),
                                method.getName(),
                                false,
358
                                semanticServices.getTypeTransformer().transformToType(returnType, resolverForTypeParameters),
359 360 361 362 363 364 365 366 367 368
                                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);
            }
369 370
        }
        else {
371 372 373 374 375
            for (PsiMethod psiConstructor : psiConstructors) {
                PsiMethodWrapper constructor = new PsiMethodWrapper(psiConstructor);

                if (constructor.getJetConstructor().hidden()) {
                    continue;
376 377
                }

378
                ConstructorDescriptorImpl constructorDescriptor = new ConstructorDescriptorImpl(
379
                        classData.classDescriptor,
A
Andrey Breslav 已提交
380
                        Collections.<AnnotationDescriptor>emptyList(), // TODO
381
                        false);
382
                ValueParameterDescriptors valueParameterDescriptors = resolveParameterDescriptors(constructorDescriptor,
383
                        constructor.getParameters(),
384
                        new TypeVariableResoverFromTypeDescriptorsInitialization(classData.typeParameters, null) // TODO: outer too
385
                    );
386 387 388 389
                if (valueParameterDescriptors.receiverType != null) {
                    throw new IllegalStateException();
                }
                constructorDescriptor.initialize(typeParameters, valueParameterDescriptors.descriptors, Modality.FINAL,
390
                                                 resolveVisibilityFromPsiModifiers(psiConstructor));
391
                constructorDescriptor.setReturnType(classData.classDescriptor.getDefaultType());
392
                classData.classDescriptor.addConstructor(constructorDescriptor, null);
393
                semanticServices.getTrace().record(BindingContext.CONSTRUCTOR, psiConstructor, constructorDescriptor);
394
            }
A
Andrey Breslav 已提交
395
        }
396

397
        semanticServices.getTrace().record(BindingContext.CLASS, psiClass, classData.classDescriptor);
398

399
        return classData;
400 401
    }

402
    private List<TypeParameterDescriptorInitialization> createUninitializedClassTypeParameters(PsiClass psiClass, ResolverBinaryClassData classData, TypeVariableByNameResolver typeVariableByNameResolver) {
403 404 405 406 407
        JetClassAnnotation jetClassAnnotation = JetClassAnnotation.get(psiClass);
        classData.kotlin = jetClassAnnotation.isDefined();
        
        if (jetClassAnnotation.signature().length() > 0) {
            return resolveClassTypeParametersFromJetSignature(
408
                    jetClassAnnotation.signature(), psiClass, classData.classDescriptor, typeVariableByNameResolver);
409
        }
410

411
        return makeUninitializedTypeParameters(classData.classDescriptor, psiClass.getTypeParameters());
412 413
    }

414
    @NotNull
415
    private PsiTypeParameter getPsiTypeParameterByName(PsiTypeParameterListOwner clazz, String name) {
416 417 418 419 420
        for (PsiTypeParameter typeParameter : clazz.getTypeParameters()) {
            if (typeParameter.getName().equals(name)) {
                return typeParameter; 
            }
        }
421 422 423
        throw new IllegalStateException("PsiTypeParameter '" + name + "' is not found");
    }

S
Stepan Koltsov 已提交
424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440

    // 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();
    }


441 442 443 444 445
    private abstract class JetSignatureTypeParameterVisitor extends JetSignatureExceptionsAdapter {
        
        private final DeclarationDescriptor containingDeclaration;
        private final PsiTypeParameterListOwner psiOwner;
        private final String name;
446
        private final boolean reified;
447
        private final int index;
448
        private final TypeInfoVariance variance;
449
        private final TypeVariableByNameResolver typeVariableByNameResolver;
450 451

        protected JetSignatureTypeParameterVisitor(DeclarationDescriptor containingDeclaration, PsiTypeParameterListOwner psiOwner,
452
                String name, boolean reified, int index, TypeInfoVariance variance, TypeVariableByNameResolver typeVariableByNameResolver)
453
        {
454 455 456 457
            if (name.isEmpty()) {
                throw new IllegalStateException();
            }
            
458 459 460
            this.containingDeclaration = containingDeclaration;
            this.psiOwner = psiOwner;
            this.name = name;
461
            this.reified = reified;
462
            this.index = index;
463
            this.variance = variance;
464
            this.typeVariableByNameResolver = typeVariableByNameResolver;
465 466 467 468
        }

        List<JetType> upperBounds = new ArrayList<JetType>();
        List<JetType> lowerBounds = new ArrayList<JetType>();
S
Stepan Koltsov 已提交
469
        
470 471
        @Override
        public JetSignatureVisitor visitClassBound() {
472
            return new JetTypeJetSignatureReader(semanticServices, semanticServices.getJetSemanticServices().getStandardLibrary(), typeVariableByNameResolver) {
473 474
                @Override
                protected void done(@NotNull JetType jetType) {
S
Stepan Koltsov 已提交
475 476 477
                    if (isJavaLangObject(jetType)) {
                        return;
                    }
478 479 480 481 482 483 484
                    upperBounds.add(jetType);
                }
            };
        }

        @Override
        public JetSignatureVisitor visitInterfaceBound() {
485
            return new JetTypeJetSignatureReader(semanticServices, semanticServices.getJetSemanticServices().getStandardLibrary(), typeVariableByNameResolver) {
486 487 488 489 490 491 492 493 494 495 496 497
                @Override
                protected void done(@NotNull JetType jetType) {
                    upperBounds.add(jetType);
                }
            };
        }

        @Override
        public void visitFormalTypeParameterEnd() {
            TypeParameterDescriptor typeParameter = TypeParameterDescriptor.createForFurtherModification(
                    containingDeclaration,
                    Collections.<AnnotationDescriptor>emptyList(), // TODO: wrong
498
                    reified,
499 500
                    JetSignatureUtils.translateVariance(variance),
                    name,
501
                    index);
502
            PsiTypeParameter psiTypeParameter = getPsiTypeParameterByName(psiOwner, name);
503 504
            TypeParameterDescriptorInitialization typeParameterDescriptorInitialization = new TypeParameterDescriptorInitialization(typeParameter, psiTypeParameter, upperBounds, lowerBounds);
            done(typeParameterDescriptorInitialization);
505 506
        }
        
507
        protected abstract void done(@NotNull TypeParameterDescriptorInitialization typeParameterDescriptor);
508 509
    }

510 511 512
    /**
     * @see #resolveMethodTypeParametersFromJetSignature(String, FunctionDescriptor)
     */
513 514 515
    private List<TypeParameterDescriptorInitialization> resolveClassTypeParametersFromJetSignature(String jetSignature, final PsiClass clazz,
            final ClassDescriptor classDescriptor, final TypeVariableByNameResolver outerClassTypeVariableByNameResolver) {
        final List<TypeParameterDescriptorInitialization> r = new ArrayList<TypeParameterDescriptorInitialization>();
516
        
517
        class MyTypeVariableByNameResolver implements TypeVariableByNameResolver {
518 519 520 521

            @NotNull
            @Override
            public TypeParameterDescriptor getTypeVariable(@NotNull String name) {
522 523 524
                for (TypeParameterDescriptorInitialization typeParameter : r) {
                    if (typeParameter.descriptor.getName().equals(name)) {
                        return typeParameter.descriptor;
525 526
                    }
                }
527
                return outerClassTypeVariableByNameResolver.getTypeVariable(name);
528 529 530
            }
        }
        
531
        new JetSignatureReader(jetSignature).accept(new JetSignatureExceptionsAdapter() {
532 533
            private int formalTypeParameterIndex = 0;
            
534
            @Override
535
            public JetSignatureVisitor visitFormalTypeParameter(final String name, final TypeInfoVariance variance, boolean reified) {
536
                return new JetSignatureTypeParameterVisitor(classDescriptor, clazz, name, reified, formalTypeParameterIndex++, variance, new MyTypeVariableByNameResolver()) {
537
                    @Override
538
                    protected void done(TypeParameterDescriptorInitialization typeParameterDescriptor) {
539
                        r.add(typeParameterDescriptor);
540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558
                    }
                };
            }

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

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

559 560 561
    private DeclarationDescriptor resolveParentDescriptor(PsiClass psiClass) {
        PsiClass containingClass = psiClass.getContainingClass();
        if (containingClass != null) {
562
            return resolveClass(containingClass);
563 564 565 566 567 568 569
        }
        
        PsiJavaFile containingFile = (PsiJavaFile) psiClass.getContainingFile();
        String packageName = containingFile.getPackageName();
        return resolveNamespace(packageName);
    }

570 571
    private List<TypeParameterDescriptorInitialization> makeUninitializedTypeParameters(@NotNull DeclarationDescriptor containingDeclaration, @NotNull PsiTypeParameter[] typeParameters) {
        List<TypeParameterDescriptorInitialization> result = Lists.newArrayList();
572
        for (PsiTypeParameter typeParameter : typeParameters) {
573
            TypeParameterDescriptorInitialization typeParameterDescriptor = makeUninitializedTypeParameter(containingDeclaration, typeParameter);
A
Andrey Breslav 已提交
574
            result.add(typeParameterDescriptor);
575 576 577 578
        }
        return result;
    }

579
    @NotNull
580
    private TypeParameterDescriptorInitialization makeUninitializedTypeParameter(@NotNull DeclarationDescriptor containingDeclaration, @NotNull PsiTypeParameter psiTypeParameter) {
581
        TypeParameterDescriptor typeParameterDescriptor = TypeParameterDescriptor.createForFurtherModification(
582
                containingDeclaration,
A
Andrey Breslav 已提交
583
                Collections.<AnnotationDescriptor>emptyList(), // TODO
A
Andrey Breslav 已提交
584
                false,
585
                Variance.INVARIANT,
586 587
                psiTypeParameter.getName(),
                psiTypeParameter.getIndex()
588
        );
589
        return new TypeParameterDescriptorInitialization(typeParameterDescriptor, psiTypeParameter);
590 591
    }

592 593 594 595
    private void initializeTypeParameter(TypeParameterDescriptorInitialization typeParameter, TypeVariableByPsiResolver typeVariableByPsiResolver) {
        TypeParameterDescriptor typeParameterDescriptor = typeParameter.descriptor;
        if (typeParameter.origin == TypeParameterDescriptorOrigin.KOTLIN) {
            List<?> upperBounds = typeParameter.upperBoundsForKotlin;
596 597 598
            if (upperBounds.size() == 0){
                typeParameterDescriptor.addUpperBound(JetStandardClasses.getNullableAnyType());
            } else {
599
                for (JetType upperBound : typeParameter.upperBoundsForKotlin) {
600 601 602 603 604
                    typeParameterDescriptor.addUpperBound(upperBound);
                }
            }

            // TODO: lower bounds
605
        } else {
606
            PsiClassType[] referencedTypes = typeParameter.psiTypeParameter.getExtendsList().getReferencedTypes();
607 608 609 610
            if (referencedTypes.length == 0){
                typeParameterDescriptor.addUpperBound(JetStandardClasses.getNullableAnyType());
            }
            else if (referencedTypes.length == 1) {
611
                typeParameterDescriptor.addUpperBound(semanticServices.getTypeTransformer().transformToType(referencedTypes[0], typeVariableByPsiResolver));
612 613 614
            }
            else {
                for (PsiClassType referencedType : referencedTypes) {
615
                    typeParameterDescriptor.addUpperBound(semanticServices.getTypeTransformer().transformToType(referencedType, typeVariableByPsiResolver));
616
                }
A
Andrey Breslav 已提交
617 618
            }
        }
619
        typeParameterDescriptor.setInitialized();
620 621
    }

622 623 624 625 626
    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 已提交
627
        }
A
Andrey Breslav 已提交
628 629
    }

630
    private Collection<? extends JetType> getSupertypes(PsiClassWrapper psiClass, List<TypeParameterDescriptorInitialization> typeParameters) {
631 632 633
        final List<JetType> result = new ArrayList<JetType>();

        if (psiClass.getJetClass().signature().length() > 0) {
634
            final TypeVariableResolver typeVariableResolver = new TypeVariableResoverFromTypeDescriptorsInitialization(typeParameters, null);
635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667
            
            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 {
668 669
            transformSupertypeList(result, psiClass.getPsiClass().getExtendsListTypes(), new TypeVariableResoverFromTypeDescriptorsInitialization(typeParameters, null));
            transformSupertypeList(result, psiClass.getPsiClass().getImplementsListTypes(), new TypeVariableResoverFromTypeDescriptorsInitialization(typeParameters, null));
670 671 672 673
        }
        if (result.isEmpty()) {
            result.add(JetStandardClasses.getAnyType());
        }
674 675 676
        return result;
    }

677
    private void transformSupertypeList(List<JetType> result, PsiClassType[] extendsListTypes, TypeVariableResolver typeVariableResolver) {
678
        for (PsiClassType type : extendsListTypes) {
679 680 681 682 683
            PsiClass resolved = type.resolve();
            if (resolved != null && resolved.getQualifiedName().equals(JvmStdlibNames.JET_OBJECT.getFqName())) {
                continue;
            }
            
684
            JetType transform = semanticServices.getTypeTransformer().transformToType(type, typeVariableResolver);
685 686 687 688 689

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

690 691
    @Nullable
    public NamespaceDescriptor resolveNamespace(@NotNull String qualifiedName) {
692 693 694 695 696 697
        // First, let's check that there is no Kotlin package:
        NamespaceDescriptor kotlinNamespaceDescriptor = semanticServices.getKotlinNamespaceDescriptor(qualifiedName);
        if (kotlinNamespaceDescriptor != null) {
            return kotlinNamespaceDescriptor;
        }

698
        PsiPackage psiPackage = findPackage(qualifiedName);
699
        if (psiPackage == null) {
700
            PsiClass psiClass = findClass(qualifiedName);
A
Andrey Breslav 已提交
701 702
            if (psiClass == null) return null;
            return resolveNamespace(psiClass);
703 704 705 706
        }
        return resolveNamespace(psiPackage);
    }

707
    public PsiClass findClass(String qualifiedName) {
708
        PsiClass original = javaFacade.findClass(qualifiedName, javaSearchScope);
M
Maxim Shafirov 已提交
709
        PsiClass altClass = altClassFinder.findClass(qualifiedName);
710 711 712 713 714 715 716 717
        if (altClass != null) {
            if (altClass instanceof ClsClassImpl) {
                altClass.putUserData(ClsClassImpl.DELEGATE_KEY, original);
            }

            return altClass;
        }
        return original;
718 719
    }

720
    /*package*/ PsiPackage findPackage(String qualifiedName) {
721 722 723
        return javaFacade.findPackage(qualifiedName);
    }

724
    private NamespaceDescriptor resolveNamespace(@NotNull PsiPackage psiPackage) {
725 726 727 728 729
        ResolverNamespaceData namespaceData = namespaceDescriptorCache.get(psiPackage);
        if (namespaceData == null) {
            namespaceData = createJavaNamespaceDescriptor(psiPackage);
            namespaceDescriptorCache.put(psiPackage, namespaceData);
            namespaceDescriptorCacheByFqn.put(psiPackage.getQualifiedName(), namespaceData);
730
        }
731
        return namespaceData.namespaceDescriptor;
732 733
    }

A
Andrey Breslav 已提交
734
    private NamespaceDescriptor resolveNamespace(@NotNull PsiClass psiClass) {
735 736 737 738 739
        ResolverNamespaceData namespaceData = namespaceDescriptorCache.get(psiClass);
        if (namespaceData == null) {
            namespaceData = createJavaNamespaceDescriptor(psiClass);
            namespaceDescriptorCache.put(psiClass, namespaceData);
            namespaceDescriptorCacheByFqn.put(psiClass.getQualifiedName(), namespaceData);
A
Andrey Breslav 已提交
740
        }
741
        return namespaceData.namespaceDescriptor;
A
Andrey Breslav 已提交
742 743
    }

744 745
    private ResolverNamespaceData createJavaNamespaceDescriptor(@NotNull PsiPackage psiPackage) {
        ResolverNamespaceData namespaceData = new ResolverNamespaceData();
746
        String name = psiPackage.getName();
747
        namespaceData.namespaceDescriptor = new JavaNamespaceDescriptor(
748
                resolveParentDescriptor(psiPackage),
A
Andrey Breslav 已提交
749
                Collections.<AnnotationDescriptor>emptyList(), // TODO
750
                name == null ? JAVA_ROOT : name,
751 752
                name == null ? JAVA_ROOT : psiPackage.getQualifiedName(),
                true
753
        );
754

755 756 757 758 759
        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;
760 761
    }

762 763 764 765 766 767 768 769
    private DeclarationDescriptor resolveParentDescriptor(@NotNull PsiPackage psiPackage) {
        PsiPackage parentPackage = psiPackage.getParentPackage();
        if (parentPackage == null) {
            return null;
        }
        return resolveNamespace(parentPackage);
    }

770 771 772
    private ResolverNamespaceData createJavaNamespaceDescriptor(@NotNull final PsiClass psiClass) {
        ResolverNamespaceData namespaceData = new ResolverNamespaceData();
        namespaceData.namespaceDescriptor = new JavaNamespaceDescriptor(
773
                resolveParentDescriptor(psiClass),
A
Andrey Breslav 已提交
774
                Collections.<AnnotationDescriptor>emptyList(), // TODO
775
                psiClass.getName(),
776 777
                psiClass.getQualifiedName(),
                false
778
        );
779 780 781
        namespaceData.namespaceDescriptor.setMemberScope(new JavaClassMembersScope(namespaceData.namespaceDescriptor, psiClass, semanticServices, true));
        semanticServices.getTrace().record(BindingContext.NAMESPACE, psiClass, namespaceData.namespaceDescriptor);
        return namespaceData;
782
    }
783 784 785 786 787 788 789 790 791 792
    
    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;
        }
    }
793

794 795
    private ValueParameterDescriptors resolveParameterDescriptors(DeclarationDescriptor containingDeclaration,
            List<PsiParameterWrapper> parameters, TypeVariableResolver typeVariableResolver) {
796
        List<ValueParameterDescriptor> result = new ArrayList<ValueParameterDescriptor>();
797
        JetType receiverType = null;
798
        int indexDelta = 0;
799 800
        for (int i = 0, parametersLength = parameters.size(); i < parametersLength; i++) {
            PsiParameterWrapper parameter = parameters.get(i);
801
            JvmMethodParameterMeaning meaning = resolveParameterDescriptor(containingDeclaration, i + indexDelta, parameter, typeVariableResolver);
802 803
            if (meaning.kind == JvmMethodParameterKind.TYPE_INFO) {
                // TODO
804
                --indexDelta;
805 806 807 808 809 810
            } 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");
                }
811
                --indexDelta;
812
                receiverType = meaning.receiverType;
S
Stepan Koltsov 已提交
813
            }
814
        }
815
        return new ValueParameterDescriptors(receiverType, result);
816
    }
A
Andrey Breslav 已提交
817

818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850
    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
851
    private JvmMethodParameterMeaning resolveParameterDescriptor(DeclarationDescriptor containingDeclaration, int i,
852 853 854 855 856 857 858
            PsiParameterWrapper parameter, TypeVariableResolver typeVariableResolver) {

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

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

860
        boolean nullable = parameter.getJetValueParameter().nullable();
861

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

865 866
        if (parameter.getJetValueParameter().name().length() > 0) {
            name = parameter.getJetValueParameter().name();
867 868
        }
        
869 870 871 872
        String typeFromAnnotation = parameter.getJetValueParameter().type();
        boolean receiver = parameter.getJetValueParameter().receiver();
        boolean hasDefaultValue = parameter.getJetValueParameter().hasDefaultValue();

S
Stepan Koltsov 已提交
873
        JetType outType;
874
        if (typeFromAnnotation.length() > 0) {
875
            outType = semanticServices.getTypeTransformer().transformToType(typeFromAnnotation, typeVariableResolver);
S
Stepan Koltsov 已提交
876
        } else {
877
            outType = semanticServices.getTypeTransformer().transformToType(psiType, typeVariableResolver);
S
Stepan Koltsov 已提交
878
        }
879 880 881 882 883 884 885 886

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

887 888 889 890 891 892 893 894
        if (receiver) {
            return JvmMethodParameterMeaning.receiver(outType);
        } else {
            return JvmMethodParameterMeaning.regular(new ValueParameterDescriptorImpl(
                    containingDeclaration,
                    i,
                    Collections.<AnnotationDescriptor>emptyList(), // TODO
                    name,
S
Stepan Koltsov 已提交
895
                    false,
896
                    nullable ? TypeUtils.makeNullableAsSpecified(outType, nullable) : outType,
897
                    hasDefaultValue,
898 899 900
                    varargElementType
            ));
        }
901 902
    }

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

906 907 908
        NamedMembers namedMembers = scopeData.namedMembersMap.get(fieldName);
        if (namedMembers == null) {
            return Collections.emptySet();
909 910
        }

911
        resolveNamedGroupProperties(owner, scopeData, staticMembers, namedMembers, fieldName);
912

913 914 915 916
        return namedMembers.propertyDescriptors;
    }
    
    @NotNull
917
    public Set<VariableDescriptor> resolveFieldGroup(@NotNull ClassOrNamespaceDescriptor owner, PsiClass psiClass, boolean staticMembers) {
918

919 920 921 922 923 924
        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();
925
            if (namedMembers.propertyAccessors == null) {
926 927 928 929
                continue;
            }
            
            String propertyName = entry.getKey();
930

931
            resolveNamedGroupProperties(owner, scopeData, staticMembers, namedMembers, propertyName);
932
            descriptors.addAll(namedMembers.propertyDescriptors);
933
        }
934
        return descriptors;
935
    }
936 937 938 939 940 941 942
    
    private Object key(TypeSource typeSource) {
        if (typeSource == null) {
            return "";
        } else if (typeSource.getTypeString().length() > 0) {
            return typeSource.getTypeString();
        } else {
943
            return psiTypeToKey(typeSource.getPsiType());
944 945
        }
    }
946 947 948 949 950 951 952 953 954 955 956 957 958

    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());
        }
    }

959 960 961 962 963
    private Object propertyKeyForGrouping(PropertyAccessorData propertyAccessor) {
        Object type = key(propertyAccessor.getType());
        Object receiverType = key(propertyAccessor.getReceiverType());
        return Pair.create(type, receiverType);
    }
964

965 966 967 968
    private void resolveNamedGroupProperties(
            @NotNull ClassOrNamespaceDescriptor owner,
            @NotNull ResolverScopeData scopeData,
            boolean staticMembers, NamedMembers namedMembers, String propertyName) {
969 970 971 972
        if (namedMembers.propertyDescriptors != null) {
            return;
        }
        
973
        if (namedMembers.propertyAccessors == null) {
974 975 976
            namedMembers.propertyDescriptors = Collections.emptySet();
            return;
        }
977 978 979 980

        final List<TypeParameterDescriptorInitialization> classTypeParameterDescriptorInitialization;
        if (scopeData instanceof ResolverBinaryClassData) {
            classTypeParameterDescriptorInitialization = ((ResolverBinaryClassData) scopeData).typeParameters;
981
        } else {
982
            classTypeParameterDescriptorInitialization = new ArrayList<TypeParameterDescriptorInitialization>(0);
983
        }
984

985 986
        TypeVariableResolver typeVariableResolver = new TypeVariableResoverFromTypeDescriptorsInitialization(classTypeParameterDescriptorInitialization, null);

987 988 989 990
        class GroupingValue {
            PropertyAccessorData getter;
            PropertyAccessorData setter;
            PropertyAccessorData field;
991
        }
992 993
        
        Map<Object, GroupingValue> map = new HashMap<Object, GroupingValue>();
994

995
        for (PropertyAccessorData propertyAccessor : namedMembers.propertyAccessors) {
996

997 998 999 1000 1001 1002 1003
            Object key = propertyKeyForGrouping(propertyAccessor);
            
            GroupingValue value = map.get(key);
            if (value == null) {
                value = new GroupingValue();
                map.put(key, value);
            }
1004

1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022
            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();
            }
1023
        }
1024

1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038
        
        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;
            }
1039

1040 1041 1042 1043 1044 1045 1046 1047 1048 1049
            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();
            }
1050

1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064
            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,
1065 1066
                    propertyName,
                    CallableMemberDescriptor.Kind.DECLARATION);
1067

1068 1069 1070
            PropertyGetterDescriptor getterDescriptor = null;
            PropertySetterDescriptor setterDescriptor = null;
            if (members.getter != null) {
1071
                getterDescriptor = new PropertyGetterDescriptor(propertyDescriptor, Collections.<AnnotationDescriptor>emptyList(), Modality.OPEN, Visibility.PUBLIC, true, false, CallableMemberDescriptor.Kind.DECLARATION);
1072 1073
            }
            if (members.setter != null) {
1074
                setterDescriptor = new PropertySetterDescriptor(propertyDescriptor, Collections.<AnnotationDescriptor>emptyList(), Modality.OPEN, Visibility.PUBLIC, true, false, CallableMemberDescriptor.Kind.DECLARATION);
1075
            }
1076

1077
            propertyDescriptor.initialize(getterDescriptor, setterDescriptor);
1078

1079
            List<TypeParameterDescriptorInitialization> typeParametersInitialization = new ArrayList<TypeParameterDescriptorInitialization>(0);
1080 1081 1082

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

1084
                if (anyMember == members.setter) {
1085
                    typeParametersInitialization = resolveMethodTypeParameters(method, setterDescriptor, typeVariableResolver);
1086 1087 1088 1089 1090 1091
                }
            }
            if (members.getter != null) {
                PsiMethodWrapper method = (PsiMethodWrapper) members.getter.getMember();

                if (anyMember == members.getter) {
1092
                    typeParametersInitialization = resolveMethodTypeParameters(method, getterDescriptor, typeVariableResolver);
1093 1094 1095
                }
            }

1096 1097 1098 1099 1100 1101 1102 1103 1104 1105
            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);

1106 1107 1108 1109
            JetType propertyType;
            if (anyMember.getType().getTypeString().length() > 0) {
                propertyType = semanticServices.getTypeTransformer().transformToType(anyMember.getType().getTypeString(), typeVariableResolverForPropertyInternals);
            } else {
1110
                propertyType = semanticServices.getTypeTransformer().transformToType(anyMember.getType().getPsiType(), typeVariableResolverForPropertyInternals);
1111 1112 1113 1114 1115 1116 1117 1118
            }
            
            JetType receiverType;
            if (anyMember.getReceiverType() == null) {
                receiverType = null;
            } else if (anyMember.getReceiverType().getTypeString().length() > 0) {
                receiverType = semanticServices.getTypeTransformer().transformToType(anyMember.getReceiverType().getTypeString(), typeVariableResolverForPropertyInternals);
            } else {
1119
                receiverType = semanticServices.getTypeTransformer().transformToType(anyMember.getReceiverType().getPsiType(), typeVariableResolverForPropertyInternals);
1120 1121 1122 1123 1124 1125 1126
            }

            propertyDescriptor.setType(
                    propertyType,
                    typeParameters,
                    DescriptorUtils.getExpectedThisObjectIfNeeded(owner),
                    receiverType
1127
            );
1128 1129 1130 1131
            if (getterDescriptor != null) {
                getterDescriptor.initialize(propertyType);
            }
            if (setterDescriptor != null) {
1132
                setterDescriptor.initialize(new ValueParameterDescriptorImpl(setterDescriptor, 0, Collections.<AnnotationDescriptor>emptyList(), "p0"/*TODO*/, false, propertyDescriptor.getOutType(), false, null));
1133 1134 1135 1136 1137
            }

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

1140
        namedMembers.propertyDescriptors = r;
1141
    }
1142

1143
    private void resolveNamedGroupFunctions(ClassOrNamespaceDescriptor owner, PsiClass psiClass, TypeSubstitutor typeSubstitutorForGenericSuperclasses, NamedMembers namedMembers) {
1144 1145 1146
        if (namedMembers.functionDescriptors != null) {
            return;
        }
1147

1148 1149 1150
        if (namedMembers.methods == null) {
            namedMembers.functionDescriptors = Collections.emptySet();
            return;
1151
        }
1152 1153 1154

        Set<FunctionDescriptor> functionDescriptors = new HashSet<FunctionDescriptor>(namedMembers.methods.size());
        for (PsiMethodWrapper method : namedMembers.methods) {
1155 1156 1157 1158
            FunctionDescriptor function = resolveMethodToFunctionDescriptor(owner, psiClass, typeSubstitutorForGenericSuperclasses, method);
            if (function != null) {
                functionDescriptors.add(function);
            }
1159
        }
1160
        namedMembers.functionDescriptors = functionDescriptors;
1161 1162
    }

1163
    private ResolverScopeData getResolverScopeData(@NotNull ClassOrNamespaceDescriptor owner, PsiClassWrapper psiClass) {
1164
        ResolverScopeData scopeData;
1165
        boolean staticMembers;
1166 1167
        if (owner instanceof JavaNamespaceDescriptor) {
            scopeData = namespaceDescriptorCacheByFqn.get(((JavaNamespaceDescriptor) owner).getQualifiedName());
1168
            staticMembers = true;
1169
        } else if (owner instanceof ClassDescriptor) {
1170
            scopeData = classDescriptorCache.get(psiClass.getQualifiedName());
1171
            staticMembers = false;
1172
        } else {
1173
            throw new IllegalStateException("unknown owner: " + owner.getClass().getName());
1174 1175 1176 1177 1178
        }
        if (scopeData == null) {
            throw new IllegalStateException();
        }
        
1179 1180
        if (scopeData.namedMembersMap == null) {
            scopeData.namedMembersMap = JavaDescriptorResolverHelper.getNamedMembers(psiClass, staticMembers, scopeData.kotlin);
1181 1182
        }
        
1183
        return scopeData;
1184
    }
A
Andrey Breslav 已提交
1185

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

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

1191 1192 1193 1194 1195
        Map<String, NamedMembers> namedMembersMap = resolverScopeData.namedMembersMap;

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

1198 1199 1200 1201 1202 1203
        TypeSubstitutor typeSubstitutor;
        if (descriptor instanceof ClassDescriptor && !staticMembers) {
            typeSubstitutor = createSubstitutorForGenericSupertypes((ClassDescriptor) descriptor);
        } else {
            typeSubstitutor = TypeSubstitutor.EMPTY;
        }
1204
        resolveNamedGroupFunctions(descriptor, psiClass, typeSubstitutor, namedMembers);
1205 1206
        
        return namedMembers.functionDescriptors;
1207 1208
    }

1209
    private TypeSubstitutor createSubstitutorForGenericSupertypes(@Nullable ClassDescriptor classDescriptor) {
A
Andrey Breslav 已提交
1210 1211 1212 1213 1214 1215 1216 1217 1218 1219
        TypeSubstitutor typeSubstitutor;
        if (classDescriptor != null) {
            typeSubstitutor = TypeUtils.buildDeepSubstitutor(classDescriptor.getDefaultType());
        }
        else {
            typeSubstitutor = TypeSubstitutor.EMPTY;
        }
        return typeSubstitutor;
    }

1220 1221 1222
    // 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);
1223

1224 1225 1226
        if (classData instanceof ResolverSrcClassData) {
            // TODO hack
            return;
1227 1228
        }

1229 1230 1231 1232 1233 1234 1235 1236 1237 1238
        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);
1239 1240
        }
    }
1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275
    
    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());
    }
1276

A
Andrey Breslav 已提交
1277
    @Nullable
1278
    private FunctionDescriptor resolveMethodToFunctionDescriptor(ClassOrNamespaceDescriptor owner, final PsiClass psiClass, TypeSubstitutor typeSubstitutorForGenericSuperclasses, final PsiMethodWrapper method) {
1279
        
1280
        PsiType returnType = method.getReturnType();
A
Andrey Breslav 已提交
1281 1282 1283
        if (returnType == null) {
            return null;
        }
1284
        FunctionDescriptor functionDescriptor = methodDescriptorCache.get(method.getPsiMethod());
A
Andrey Breslav 已提交
1285
        if (functionDescriptor != null) {
1286
            if (method.getPsiMethod().getContainingClass() != psiClass) {
A
Andrey Breslav 已提交
1287 1288 1289 1290
                functionDescriptor = functionDescriptor.substitute(typeSubstitutorForGenericSuperclasses);
            }
            return functionDescriptor;
        }
1291

1292 1293
        ResolverScopeData scopeData = getResolverScopeData(owner, new PsiClassWrapper(psiClass));

1294 1295 1296 1297 1298 1299 1300 1301 1302
        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 {
1303
            ResolverBinaryClassData classData = classDescriptorCache.get(psiClass.getQualifiedName());
1304 1305 1306 1307 1308 1309
            if (classData == null) {
                throw new IllegalStateException("classData not found by name " + psiClass.getQualifiedName());
            }
            kotlin = classData.kotlin;
        }

1310
        // TODO: ugly
1311
        if (method.getJetMethod().kind() == JvmStdlibNames.JET_METHOD_KIND_PROPERTY) {
1312
            return null;
1313
        }
1314

S
Stepan Koltsov 已提交
1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335
        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;
            }
        }

1336 1337
        DeclarationDescriptor classDescriptor;
        final List<TypeParameterDescriptor> classTypeParameters;
1338 1339
        final List<TypeParameterDescriptorInitialization> classTypeParameterDescriptorsInitialization;
        if (scopeData instanceof ResolverBinaryClassData) {
1340
            ClassDescriptor classClassDescriptor = resolveClass(method.getPsiMethod().getContainingClass());
1341 1342
            classDescriptor = classClassDescriptor;
            classTypeParameters = classClassDescriptor.getTypeConstructor().getParameters();
1343 1344 1345 1346 1347 1348 1349 1350
            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);
1351
        }
1352 1353 1354
        if (classDescriptor == null) {
            return null;
        }
S
Stepan Koltsov 已提交
1355
        NamedFunctionDescriptorImpl functionDescriptorImpl = new NamedFunctionDescriptorImpl(
A
Andrey Breslav 已提交
1356 1357
                owner,
                Collections.<AnnotationDescriptor>emptyList(), // TODO
1358 1359
                method.getName(),
                CallableMemberDescriptor.Kind.DECLARATION
A
Andrey Breslav 已提交
1360
        );
1361
        methodDescriptorCache.put(method.getPsiMethod(), functionDescriptorImpl);
1362 1363

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

1366 1367 1368 1369 1370
        final List<TypeParameterDescriptorInitialization> methodTypeParametersInitialization = resolveMethodTypeParameters(method, functionDescriptorImpl, typeVariableResolverForParameters);
        List<TypeParameterDescriptor> methodTypeParameters = new ArrayList<TypeParameterDescriptor>();
        for (TypeParameterDescriptorInitialization typeParameterDescriptorInitialization : methodTypeParametersInitialization) {
            methodTypeParameters.add(typeParameterDescriptorInitialization.descriptor);
        }
1371 1372

        class MethodTypeVariableResolver implements TypeVariableResolver {
1373 1374 1375 1376
            @NotNull
            @Override
            public TypeParameterDescriptor getTypeVariable(@NotNull PsiTypeParameter psiTypeParameter) {
                for (TypeParameterDescriptorInitialization typeParameter : methodTypeParametersInitialization) {
1377
                    if (equal(typeParameter.psiTypeParameter, psiTypeParameter)) {
1378 1379 1380 1381
                        return typeParameter.descriptor;
                    }
                }
                for (TypeParameterDescriptorInitialization typeParameter : classTypeParameterDescriptorsInitialization) {
1382
                    if (equal(typeParameter.psiTypeParameter, psiTypeParameter)) {
1383 1384 1385
                        return typeParameter.descriptor;
                    }
                }
1386
                throw new IllegalStateException("unresolved PsiTypeParameter " + psiTypeParameter.getName() + " in method " + method.getName() + " in class " + psiClass.getQualifiedName()); // TODO: report properly
1387
            }
1388

S
Stepan Koltsov 已提交
1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404
            @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
            }

1405 1406 1407
            @NotNull
            @Override
            public TypeParameterDescriptor getTypeVariable(@NotNull String name) {
1408 1409 1410
                for (TypeParameterDescriptorInitialization typeParameter : methodTypeParametersInitialization) {
                    if (typeParameter.descriptor.getName().equals(name)) {
                        return typeParameter.descriptor;
1411 1412 1413 1414 1415 1416 1417 1418 1419
                    }
                }
                for (TypeParameterDescriptor typeParameter : classTypeParameters) {
                    if (typeParameter.getName().equals(name)) {
                        return typeParameter;
                    }
                }
                throw new IllegalStateException("unresolver variable: " + name); // TODO: report properly
            }
1420

1421 1422 1423
        }


1424
        ValueParameterDescriptors valueParameterDescriptors = resolveParameterDescriptors(functionDescriptorImpl, method.getParameters(), new MethodTypeVariableResolver());
A
Andrey Breslav 已提交
1425
        functionDescriptorImpl.initialize(
1426
                valueParameterDescriptors.receiverType,
A
Andrey Breslav 已提交
1427
                DescriptorUtils.getExpectedThisObjectIfNeeded(classDescriptor),
1428
                methodTypeParameters,
1429
                valueParameterDescriptors.descriptors,
1430
                makeReturnType(returnType, method, new MethodTypeVariableResolver()),
1431 1432
                Modality.convertFromFlags(method.getPsiMethod().hasModifierProperty(PsiModifier.ABSTRACT), !method.isFinal()),
                resolveVisibilityFromPsiModifiers(method.getPsiMethod())
A
Andrey Breslav 已提交
1433
        );
1434
        semanticServices.getTrace().record(BindingContext.FUNCTION, method.getPsiMethod(), functionDescriptorImpl);
A
Andrey Breslav 已提交
1435
        FunctionDescriptor substitutedFunctionDescriptor = functionDescriptorImpl;
1436
        if (method.getPsiMethod().getContainingClass() != psiClass) {
A
Andrey Breslav 已提交
1437 1438 1439 1440
            substitutedFunctionDescriptor = functionDescriptorImpl.substitute(typeSubstitutorForGenericSuperclasses);
        }
        return substitutedFunctionDescriptor;
    }
1441
    
1442
    public List<FunctionDescriptor> resolveMethods(PsiClass psiClass, ClassOrNamespaceDescriptor containingDeclaration) {
1443 1444 1445
        ResolverScopeData scopeData = getResolverScopeData(containingDeclaration, new PsiClassWrapper(psiClass));

        TypeSubstitutor substitutorForGenericSupertypes;
1446 1447
        if (scopeData instanceof ResolverBinaryClassData) {
            substitutorForGenericSupertypes = createSubstitutorForGenericSupertypes(((ResolverBinaryClassData) scopeData).classDescriptor);
1448 1449 1450 1451
        } else {
            substitutorForGenericSupertypes = TypeSubstitutor.EMPTY;
        }

1452
        List<FunctionDescriptor> functions = new ArrayList<FunctionDescriptor>();
1453 1454 1455 1456
        
        for (NamedMembers namedMembers : scopeData.namedMembersMap.values()) {
            resolveNamedGroupFunctions(containingDeclaration, psiClass, substitutorForGenericSupertypes, namedMembers);
            functions.addAll(namedMembers.functionDescriptors);
1457
        }
1458

1459 1460
        return functions;
    }
1461

1462
    private List<TypeParameterDescriptorInitialization> resolveMethodTypeParameters(
1463
            @NotNull PsiMethodWrapper method,
1464
            @NotNull DeclarationDescriptor functionDescriptor,
1465 1466 1467
            @NotNull TypeVariableResolver classTypeVariableResolver
    ) {
        List<TypeParameterDescriptorInitialization> typeParameters;
1468
        if (method.getJetMethod().typeParameters().length() > 0) {
1469
            typeParameters = resolveMethodTypeParametersFromJetSignature(
1470
                    method.getJetMethod().typeParameters(), method.getPsiMethod(), functionDescriptor, classTypeVariableResolver);
1471 1472
        } else {
            typeParameters = makeUninitializedTypeParameters(functionDescriptor, method.getPsiMethod().getTypeParameters());
1473
        }
1474

1475
        initializeTypeParameters(typeParameters, classTypeVariableResolver);
1476 1477
        return typeParameters;
    }
1478 1479

    /**
1480
     * @see #resolveClassTypeParametersFromJetSignature(String, com.intellij.psi.PsiClass, MutableClassDescriptorLite)
1481
     */
1482 1483
    private List<TypeParameterDescriptorInitialization> resolveMethodTypeParametersFromJetSignature(String jetSignature, final PsiMethod method,
            final DeclarationDescriptor functionDescriptor, final TypeVariableByNameResolver classTypeVariableByNameResolver)
1484
    {
1485
        final List<TypeParameterDescriptorInitialization> r = new ArrayList<TypeParameterDescriptorInitialization>();
1486
        
1487
        class MyTypeVariableByNameResolver implements TypeVariableByNameResolver {
1488 1489 1490 1491

            @NotNull
            @Override
            public TypeParameterDescriptor getTypeVariable(@NotNull String name) {
1492 1493 1494
                for (TypeParameterDescriptorInitialization typeParameter : r) {
                    if (typeParameter.descriptor.getName().equals(name)) {
                        return typeParameter.descriptor;
1495 1496
                    }
                }
1497
                return classTypeVariableByNameResolver.getTypeVariable(name);
1498 1499 1500
            }
        }
        
1501
        new JetSignatureReader(jetSignature).acceptFormalTypeParametersOnly(new JetSignatureExceptionsAdapter() {
1502 1503
            private int formalTypeParameterIndex = 0;
            
1504
            @Override
1505
            public JetSignatureVisitor visitFormalTypeParameter(final String name, final TypeInfoVariance variance, boolean reified) {
1506
                
1507
                return new JetSignatureTypeParameterVisitor(functionDescriptor, method, name, reified, formalTypeParameterIndex++, variance, new MyTypeVariableByNameResolver()) {
1508
                    @Override
1509
                    protected void done(TypeParameterDescriptorInitialization typeParameterDescriptor) {
1510
                        r.add(typeParameterDescriptor);
1511 1512
                    }
                };
1513

1514 1515 1516 1517 1518
            }
        });
        return r;
    }

1519 1520
    private JetType makeReturnType(PsiType returnType, PsiMethodWrapper method,
            @NotNull TypeVariableResolver typeVariableResolver) {
1521 1522 1523

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

S
Stepan Koltsov 已提交
1524
        JetType transformedType;
1525
        if (returnTypeFromAnnotation.length() > 0) {
1526
            transformedType = semanticServices.getTypeTransformer().transformToType(returnTypeFromAnnotation, typeVariableResolver);
S
Stepan Koltsov 已提交
1527
        } else {
1528
            transformedType = semanticServices.getTypeTransformer().transformToType(returnType, typeVariableResolver);
S
Stepan Koltsov 已提交
1529
        }
1530 1531
        if (method.getJetMethod().returnTypeNullable()) {
            return TypeUtils.makeNullableAsSpecified(transformedType, true);
1532 1533 1534 1535 1536
        } else {
            return transformedType;
        }
    }

1537
    private static Visibility resolveVisibilityFromPsiModifiers(PsiModifierListOwner modifierListOwner) {
1538 1539 1540 1541 1542 1543
        //TODO report error
        return modifierListOwner.hasModifierProperty(PsiModifier.PUBLIC) ? Visibility.PUBLIC :
                                        (modifierListOwner.hasModifierProperty(PsiModifier.PRIVATE) ? Visibility.PRIVATE :
                                        (modifierListOwner.hasModifierProperty(PsiModifier.PROTECTED) ? Visibility.PROTECTED : Visibility.INTERNAL));
    }

1544 1545 1546 1547
    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) {
1548 1549 1550 1551
            if (innerPsiClass.hasModifierProperty(PsiModifier.PRIVATE)) {
                // TODO: hack against inner classes
                continue;
            }
1552 1553 1554 1555
            r.add(resolveClass(innerPsiClass));
        }
        return r;
    }
1556
}