Delete JavaTypeSubstitutorImpl, use PsiSubstitutor in JavaClassImpl

Also delete related tests
2016-03-17 18:25:57 +03:00
parent 291c713d8b
commit 0ba0e2b10d
51 changed files with 14 additions and 1102 deletions
@@ -1,8 +0,0 @@
-interface arrayType {
-    interface SuperArray<T> {
-        T[] typeForSubstitute();
-    }
-
-    interface MidArray extends SuperArray<Integer> {
-    }
-}
@@ -1,8 +0,0 @@
-interface classType {
-    interface SuperClass<T> {
-        List<Integer> typeForSubstitute();
-    }
-
-    interface MidClass extends SuperClass {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface classWithWildcard {
-    interface SuperList<T> {
-        List<T> typeForSubstitute();
-    }
-
-    interface MidList<U> extends SuperList<List<? extends U>> {
-    }
-}
@@ -1,8 +0,0 @@
-interface genericArray {
-    interface SuperGenericArray<T> {
-        T typeForSubstitute();
-    }
-
-    interface MidGenericArray<T> extends SuperGenericArray<T[]> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface innerParameter {
-    interface SuperInnerParam<T> {
-        <T> T typeForSubstitute();
-    }
-
-    interface MidInnerParam<U> extends SuperInnerParam<U> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface intersectionType {
-    interface SuperIntersection<T> {
-        <R extends Enum<R> & List<T>> R typeForSubstitute();
-    }
-
-    interface MidIntersection<U> extends SuperIntersection<U> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface intersectionTypeAsTypeParameter {
-    interface Super<K> {
-        <T extends Enum<T> & List<K>> Map<? extends T, K> typeForSubstitute();
-    }
-
-    interface Sub<U> extends Super<U> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface intersectionTypeInEnum {
-    interface Super<T> {
-        <R extends Enum<R> & List<T>> Enum<R> typeForSubstitute();
-    }
-
-    interface Sub<U> extends Super<U> {
-    }
-}
@@ -1,8 +0,0 @@
-interface intersectionTypeInInterfaceDeclaration {
-    interface SuperIntersection<T extends Object & Cloneable> {
-        T typeForSubstitute();
-    }
-
-    interface MidIntersection<U extends Object & Cloneable> extends SuperIntersection<U> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface intersectionTypeInTypeVariableClass {
-    interface Super<T> {
-        <R extends Class<R> & List<T>> TypeVariable<R> typeForSubstitute();
-    }
-
-    interface Sub<U> extends Super<U> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.Map;
-
-interface mapEntry {
-    interface Super<T, E> {
-        Map.Entry<T, E> typeForSubstitute();
-    }
-
-    interface Mid<E> extends Super<E, Integer> {
-    }
-}
@@ -1,8 +0,0 @@
-interface primitiveType {
-    interface SuperPrimitive<T> {
-        int typeForSubstitute();
-    }
-
-    interface MidPrimitive extends SuperPrimitive<Integer> {
-    }
-}
@@ -1,8 +0,0 @@
-interface rawArrayType {
-    interface SuperArray<T> {
-        T[] typeForSubstitute();
-    }
-
-    interface MidArray extends SuperArray {
-    }
-}
@@ -1,8 +0,0 @@
-interface rawArrayTypeParameterWithBound {
-    interface Super<T extends Cloneable> {
-        T[] typeForSubstitute();
-    }
-
-    interface Sub extends Super {
-    }
-}
@@ -1,8 +0,0 @@
-interface rawEnum {
-    interface Super<T extends Enum<T>> {
-        Enum<T> typeForSubstitute();
-    }
-
-    interface Sub extends Super {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface rawExtendsWildcard {
-    interface SuperRawWild<T> {
-        List<? extends T> typeForSubstitute();
-    }
-
-    interface MidRawWildcard extends SuperRawWild {
-    }
-}
@@ -1,8 +0,0 @@
-interface rawIntersectionType {
-    interface Super<T extends Integer & Cloneable> {
-        T typeForSubstitute();
-    }
-
-    interface Sub extends Super {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface rawSuperWildcard {
-    interface SuperRawWild<T> {
-        List<? super T> typeForSubstitute();
-    }
-
-    interface MidRawWildcard extends SuperRawWild {
-    }
-}
@@ -1,8 +0,0 @@
-interface rawType {
-    interface Super<T> {
-        T typeForSubstitute();
-    }
-
-    interface MidRaw extends Super {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface rawTypeInDeclaration {
-    interface Super<T> {
-        List typeForSubstitute();
-    }
-
-    interface Sub<U> extends Super<U> {
-    }
-}
@@ -1,8 +0,0 @@
-interface rawTypeWithBound {
-    interface Super<T extends Integer> {
-        T typeForSubstitute();
-    }
-
-    interface MidRaw extends Super {
-    }
-}
@@ -1,8 +0,0 @@
-interface rawTypeWithSelfReferenceBound {
-    interface Super<T extends Super<T>> {
-        T typeForSubstitute();
-    }
-
-    interface MidRaw extends Super {
-    }
-}
@@ -1,10 +0,0 @@
-import java.lang.reflect.TypeVariable;
-
-interface rawWildcardInTypeVariableClass {
-    interface Super<T> {
-        TypeVariable<? super T> typeForSubstitute();
-    }
-
-    interface Sub extends Super {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface rawWildcardWithBound {
-    interface Super<T extends Cloneable> {
-        List<? extends T> typeForSubstitute();
-    }
-
-    interface Sub extends Super {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface selfReference {
-    interface SuperSelfRef<T extends SuperSelfRef<T>> {
-        public List<T> typeForSubstitute();
-    }
-
-    interface MidSelfRef extends SuperSelfRef<MidSelfRef> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface twoParameters {
-    interface SuperTwoParams<T, U> {
-        Map<T, List<U>> typeForSubstitute();
-    }
-
-    interface MidTwoParams<E> extends SuperTwoParams<Integer, E> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface twoParametersInSubClass {
-    interface SuperTwoParams<T> {
-        List<T> typeForSubstitute();
-    }
-
-    interface MidTwoParams<T, S> extends SuperTwoParams<S> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.lang.reflect.TypeVariable;
-
-interface typeVariableClass {
-    interface Super<T> {
-        TypeVariable<? super T> typeForSubstitute();
-    }
-
-    interface Mid<E> extends Super<E> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.lang.reflect.TypeVariable;
-
-interface typeVariableRaw {
-    interface Super<T extends Class> {
-        TypeVariable<T> typeForSubstitute();
-    }
-
-    interface Mid extends Super {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface unboundedWildcard {
-    interface Super<T> {
-        List<?> typeForSubstitute();
-    }
-
-    interface Sub extends Super<Integer> {
-    }
-}
@@ -1,8 +0,0 @@
-import java.util.*;
-
-interface unboundedWildcardToTypeParameter {
-    interface SupList<K> extends List<K> {
-        @Override
-        boolean retainAll(Collection<K> c); // error, check that we do not fall
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface varargArray {
-    interface Super<T> {
-        void typeForSubstitute(T... a);
-    }
-
-    interface Sub<Integer> extends Super<Integer[]> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface varargArrayTypeParameter {
-    interface Super<T> {
-        void typeForSubstitute(T... a);
-    }
-
-    interface Sub<E> extends Super<E[]> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface varargClass {
-    interface Super<T> {
-        void typeForSubstitute(List<T>... a);
-    }
-
-    interface Sub extends Super<Integer> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface varargClassWithWildcard {
-    interface Super<T> {
-        void typeForSubstitute(List<? extends T>... a);
-    }
-
-    interface Sub<E> extends Super<List<? extends E>> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface varargRawType {
-    interface Super<T> {
-        void typeForSubstitute(T... a);
-    }
-
-    interface Sub extends Super {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface varargRawTypeWithBound {
-    interface Super<T extends Integer> {
-        void typeForSubstitute(T... a);
-    }
-
-    interface Sub<E> extends Super {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface varargToClass {
-    interface Super<T> {
-        void typeForSubstitute(T... a);
-    }
-
-    interface Sub extends Super<Integer> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface varargToClassWithWildcard {
-    interface Super<T> {
-        void typeForSubstitute(T... a);
-    }
-
-    interface Sub<E> extends Super<List<? extends E>> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface wildcardExtends {
-    interface SuperWildcardExtends<T> {
-        List<? extends T> typeForSubstitute();
-    }
-
-    interface MidWildcardExtends extends SuperWildcardExtends<Integer> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface wildcardExtendsObject {
-    interface SuperWildcardExtendsObject<T> {
-        List<? extends T> typeForSubstitute();
-    }
-
-    interface MidWildcardExtendsObject extends SuperWildcardExtendsObject<Object> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface wildcardExtendsTypeParameter {
-    interface SuperWildcard<T, U> {
-        Map<? extends T, ? extends U> typeForSubstitute();
-    }
-
-    interface MidWildcard<E, K> extends SuperWildcard<E, K> {
-    }
-}
@@ -1,10 +0,0 @@
-import java.util.*;
-
-interface wildcardSuper {
-    interface SuperWildcardSuper<T> {
-        List<? extends T> typeForSubstitute();
-    }
-
-    interface MidWildcardSuper extends SuperWildcardSuper<Integer> {
-    }
-}
@@ -1,8 +0,0 @@
-import java.util.*;
-
-interface wildcardToWildcard {
-    interface SupList<K> extends List<K> {
-        @Override
-        boolean addAll(Collection<? extends K> c);
-    }
-}