Renamed & moved AllInjectorsGenerator.

compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java

@@ -33,7 +33,7 @@ import org.jetbrains.jet.codegen.ClassFileFactory;
 import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
-/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
+/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */
 public class InjectorForJvmCodegen {
 
     private final JetTypeMapper jetTypeMapper;

compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java

@@ -40,7 +40,7 @@ import org.jetbrains.jet.lang.resolve.java.resolver.JavaPropertyResolver;
 import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
-/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
+/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */
 public class InjectorForJavaDescriptorResolver {
 
     private final Project project;

compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java

@@ -40,7 +40,7 @@ import org.jetbrains.jet.lang.resolve.java.resolver.JavaPropertyResolver;
 import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
-/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
+/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */
 public class InjectorForJavaSemanticServices {
 
     private JavaSemanticServices javaSemanticServices;

compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java

@@ -62,7 +62,7 @@ import org.jetbrains.jet.lang.resolve.java.resolver.JavaPropertyResolver;
 import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
-/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
+/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */
 public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnalyzer {
 
     private TopDownAnalyzer topDownAnalyzer;

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java

@@ -124,9 +124,9 @@ class TypeTransformingVisitor extends JetVisitor<JetType, Void> {
             TypeProjection argument = arguments.get(i);
             JetType alternativeType = computeType(argumentAlternativeTypeElement, argument.getType(), originalToAltTypeParameters);
             Variance variance = argument.getProjectionKind();
+            Variance altVariance;
             if (type instanceof JetUserType) {
                 JetTypeProjection typeProjection = ((JetUserType) type).getTypeArguments().get(i);
-                Variance altVariance = Variance.INVARIANT;
                 switch (typeProjection.getProjectionKind()) {
                     case IN:
                         altVariance = Variance.IN_VARIANCE;
@@ -137,12 +137,16 @@ class TypeTransformingVisitor extends JetVisitor<JetType, Void> {
                     case STAR:
                         throw new AlternativeSignatureMismatchException("Star projection is not available in alternative signatures");
                     default:
+                        altVariance = Variance.INVARIANT;
                 }
                 if (altVariance != variance && variance != Variance.INVARIANT) {
                     throw new AlternativeSignatureMismatchException("Variance mismatch, actual: %s, in alternative signature: %s", variance, altVariance);
                 }
             }
-            altArguments.add(new TypeProjection(variance, alternativeType));
+            else {
+                altVariance = variance;
+            }
+            altArguments.add(new TypeProjection(altVariance, alternativeType));
         }
 
         TypeConstructor typeConstructor;

compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java

@@ -37,7 +37,7 @@ import org.jetbrains.jet.lang.resolve.TopDownAnalysisContext;
 import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
-/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
+/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */
 public class InjectorForBodyResolve {
 
     private BodyResolver bodyResolver;

compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java

@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.calls.CandidateResolver;
 import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
-/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
+/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */
 public class InjectorForLazyResolve {
 
     private final Project project;

compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java

@@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver;
 import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
-/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
+/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */
 public class InjectorForMacros {
 
     private ExpressionTypingServices expressionTypingServices;

compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java

@@ -46,7 +46,7 @@ import org.jetbrains.jet.lang.resolve.ScriptBodyResolver;
 import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
-/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
+/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */
 public class InjectorForTopDownAnalyzerBasic {
 
     private TopDownAnalyzer topDownAnalyzer;

compiler/tests/org/jetbrains/jet/di/InjectorForTests.java

@@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.resolve.calls.CandidateResolver;
 import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
 
-/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
+/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */
 public class InjectorForTests {
 
     private DescriptorResolver descriptorResolver;