diff options
Diffstat (limited to 'plugins/typeMigration')
983 files changed, 0 insertions, 15874 deletions
diff --git a/plugins/typeMigration/src/META-INF/plugin.xml b/plugins/typeMigration/src/META-INF/plugin.xml deleted file mode 100644 index 93ad2032892c..000000000000 --- a/plugins/typeMigration/src/META-INF/plugin.xml +++ /dev/null @@ -1,39 +0,0 @@ -<idea-plugin> - <name>Type Migration</name> - <description> - <![CDATA[ - This plugin adds the type migration refactoring. - The following features are available: - <ul> - <li>Dedicated Refactoring Dialog. (Refactor | Type Migration)</li> - <li>Ability to review type migration results. (Refactor | Migration | Preview)</li> - <li>Ability to automatically change a member type or data flow dependent type entries.</li> - <li>Ability to convert variable or method return type between arrays and collections.</li> - </ul> - ]]> - </description> - <vendor>JetBrains</vendor> - <extensions defaultExtensionNs="com.intellij"> - <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/> - <codeInsight.changeVariableTypeQuickFixProvider - implementation="com.intellij.refactoring.typeMigration.TypeMigrationVariableTypeFixProvider"/> - <conversion.rule implementation="com.intellij.refactoring.typeMigration.rules.ListArrayConversionRule"/> - <conversion.rule implementation="com.intellij.refactoring.typeMigration.rules.AtomicConversionRule"/> - <conversion.rule implementation="com.intellij.refactoring.typeMigration.rules.BoxingTypeConversionRule"/> - <conversion.rule implementation="com.intellij.refactoring.typeMigration.rules.ElementToArrayConversionRule"/> - <conversion.rule implementation="com.intellij.refactoring.typeMigration.rules.ThreadLocalConversionRule"/> - <intentionAction> - <className>com.intellij.refactoring.typeMigration.intentions.ConvertFieldToAtomicIntention</className> - <category>Concurrency</category> - </intentionAction> - <intentionAction> - <className>com.intellij.refactoring.typeMigration.intentions.ConvertFieldToThreadLocalIntention</className> - <category>Concurrency</category> - </intentionAction> - <intentionAction> - <className>com.intellij.refactoring.typeMigration.intentions.ChangeClassParametersIntention</className> - <category>Declaration</category> - </intentionAction> - </extensions> - <depends>Structural Search</depends> -</idea-plugin> diff --git a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/TypeConversionDescriptor.java b/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/TypeConversionDescriptor.java deleted file mode 100644 index d116c3ce30fe..000000000000 --- a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/TypeConversionDescriptor.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.intellij.refactoring.typeMigration; - -import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.project.Project; -import com.intellij.psi.JavaPsiFacade; -import com.intellij.psi.PsiExpression; -import com.intellij.psi.codeStyle.JavaCodeStyleManager; -import com.intellij.structuralsearch.MatchOptions; -import com.intellij.structuralsearch.plugin.replace.ReplaceOptions; -import com.intellij.structuralsearch.plugin.replace.impl.Replacer; -import com.intellij.util.IncorrectOperationException; -import org.jetbrains.annotations.NonNls; - -/** - * Created by IntelliJ IDEA. - * User: db - * Date: Sep 28, 2004 - * Time: 7:13:53 PM - * To change this template use File | Settings | File Templates. - */ -public class TypeConversionDescriptor extends TypeConversionDescriptorBase { - private static final Logger LOG = Logger.getInstance("#" + TypeConversionDescriptor.class.getName()); - - private String myStringToReplace = null; - private String myReplaceByString = "$"; - private PsiExpression myExpression; - - public TypeConversionDescriptor(@NonNls final String stringToReplace, @NonNls final String replaceByString) { - myStringToReplace = stringToReplace; - myReplaceByString = replaceByString; - } - - public TypeConversionDescriptor(@NonNls final String stringToReplace, @NonNls final String replaceByString, final PsiExpression expression) { - myStringToReplace = stringToReplace; - myReplaceByString = replaceByString; - myExpression = expression; - } - - public void setStringToReplace(String stringToReplace) { - myStringToReplace = stringToReplace; - } - - public void setReplaceByString(String replaceByString) { - myReplaceByString = replaceByString; - } - - public String getStringToReplace() { - return myStringToReplace; - } - - public String getReplaceByString() { - return myReplaceByString; - } - - public PsiExpression getExpression() { - return myExpression; - } - - public void setExpression(final PsiExpression expression) { - myExpression = expression; - } - - @Override - public void replace(PsiExpression expression) { - if (getExpression() != null) expression = getExpression(); - final Project project = expression.getProject(); - final ReplaceOptions options = new ReplaceOptions(); - options.setMatchOptions(new MatchOptions()); - final Replacer replacer = new Replacer(project, null); - try { - final String replacement = replacer.testReplace(expression.getText(), getStringToReplace(), getReplaceByString(), options); - try { - JavaCodeStyleManager.getInstance(project).shortenClassReferences(expression.replace( - JavaPsiFacade.getInstance(project).getElementFactory().createExpressionFromText(replacement, expression))); - } - catch (IncorrectOperationException e) { - LOG.error(e); - } - } - catch (IncorrectOperationException e) { - LOG.error(e); - } - } - - @Override - public String toString() { - StringBuffer buf = new StringBuffer(); - if (myReplaceByString != null) { - buf.append(myReplaceByString); - } - if (myStringToReplace != null) { - if (buf.length() > 0) buf.append(" "); - buf.append(myStringToReplace); - } - if (myExpression != null) { - if (buf.length() > 0) buf.append(" "); - buf.append(myExpression.getText()); - } - return buf.toString(); - } -} diff --git a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationVariableTypeFixProvider.java b/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationVariableTypeFixProvider.java deleted file mode 100644 index d84320e4cd08..000000000000 --- a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationVariableTypeFixProvider.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * User: anna - * Date: 27-Aug-2009 - */ -package com.intellij.refactoring.typeMigration; - -import com.intellij.codeInsight.FileModificationService; -import com.intellij.codeInsight.daemon.impl.quickfix.VariableTypeFix; -import com.intellij.codeInsight.intention.IntentionAction; -import com.intellij.codeInsight.quickfix.ChangeVariableTypeQuickFixProvider; -import com.intellij.openapi.command.undo.UndoUtil; -import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.editor.Editor; -import com.intellij.openapi.project.Project; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; -import com.intellij.psi.PsiType; -import com.intellij.psi.PsiVariable; -import com.intellij.psi.codeStyle.JavaCodeStyleManager; -import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.util.IncorrectOperationException; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -public class TypeMigrationVariableTypeFixProvider implements ChangeVariableTypeQuickFixProvider { - private static final Logger LOG1 = Logger.getInstance("#" + TypeMigrationVariableTypeFixProvider.class.getName()); - - @NotNull - public IntentionAction[] getFixes(@NotNull PsiVariable variable, @NotNull PsiType toReturn) { - return new IntentionAction[]{new VariableTypeFix(variable, toReturn) { - @NotNull - @Override - public String getText() { - return "Migrate \'" + myName + "\' type to \'" + getReturnType().getCanonicalText() + "\'"; - } - - @Override - public void invoke(@NotNull Project project, - @NotNull PsiFile file, - @Nullable("is null when called from inspection") Editor editor, - @NotNull PsiElement startElement, - @NotNull PsiElement endElement) { - final PsiVariable myVariable = (PsiVariable)startElement; - - if (!FileModificationService.getInstance().prepareFileForWrite(myVariable.getContainingFile())) return; - try { - myVariable.normalizeDeclaration(); - final TypeMigrationRules rules = new TypeMigrationRules(TypeMigrationLabeler.getElementType(myVariable)); - rules.setMigrationRootType(getReturnType()); - rules.setBoundScope(GlobalSearchScope.projectScope(project)); - TypeMigrationProcessor.runHighlightingTypeMigration(project, editor, rules, myVariable); - JavaCodeStyleManager.getInstance(project).shortenClassReferences(myVariable); - UndoUtil.markPsiFileForUndo(file); - } - catch (IncorrectOperationException e) { - LOG1.error(e); - } - } - }}; - } -} diff --git a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ChangeClassParametersIntention.java b/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ChangeClassParametersIntention.java deleted file mode 100644 index 9571807cd229..000000000000 --- a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ChangeClassParametersIntention.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.intellij.refactoring.typeMigration.intentions; - -import com.intellij.codeInsight.FileModificationService; -import com.intellij.codeInsight.hint.HintManager; -import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction; -import com.intellij.codeInsight.intention.impl.TypeExpression; -import com.intellij.codeInsight.template.*; -import com.intellij.codeInsight.template.impl.TemplateState; -import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.editor.Document; -import com.intellij.openapi.editor.Editor; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.TextRange; -import com.intellij.psi.*; -import com.intellij.psi.search.LocalSearchScope; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.refactoring.typeMigration.TypeMigrationProcessor; -import com.intellij.refactoring.typeMigration.TypeMigrationRules; -import com.intellij.util.ArrayUtil; -import com.intellij.util.IncorrectOperationException; -import org.jetbrains.annotations.NotNull; - -/** - * @author anna - */ -public class ChangeClassParametersIntention extends PsiElementBaseIntentionAction { - - private static final Logger LOG = Logger.getInstance("#" + ChangeClassParametersIntention.class); - - @NotNull - @Override - public String getText() { - return getFamilyName(); - } - - @NotNull - @Override - public String getFamilyName() { - return "Change class type parameter"; - } - - @Override - public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) { - final PsiTypeElement typeElement = PsiTreeUtil.getTopmostParentOfType(element, PsiTypeElement.class); - final PsiElement parent = typeElement != null ? typeElement.getParent() : null; - final PsiReferenceParameterList parameterList = parent instanceof PsiReferenceParameterList ? (PsiReferenceParameterList)parent : null; - if (parameterList != null && parameterList.getTypeArguments().length > 0) { - final PsiMember member = PsiTreeUtil.getParentOfType(parameterList, PsiMember.class); - if (member instanceof PsiAnonymousClass) { - final PsiClassType.ClassResolveResult result = ((PsiAnonymousClass)member).getBaseClassType().resolveGenerics(); - return result.getElement() != null && ((PsiAnonymousClass)member).getBaseClassReference().getParameterList() == parameterList; - } - } - return false; - } - - @Override - public void invoke(@NotNull final Project project, final Editor editor, @NotNull final PsiElement element) throws IncorrectOperationException { - if (!FileModificationService.getInstance().preparePsiElementsForWrite(element)) return; - - final PsiTypeElement typeElement = PsiTreeUtil.getTopmostParentOfType(element, PsiTypeElement.class); - final PsiReferenceParameterList parameterList = PsiTreeUtil.getParentOfType(element, PsiReferenceParameterList.class); - if (parameterList != null && typeElement != null) { - final PsiClass aClass = PsiTreeUtil.getParentOfType(element, PsiClass.class); - if (aClass instanceof PsiAnonymousClass) { - editor.getCaretModel().moveToOffset(aClass.getTextOffset()); - final PsiTypeElement[] typeElements = parameterList.getTypeParameterElements(); - final int changeIdx = ArrayUtil.find(typeElements, typeElement); - - final PsiClassType.ClassResolveResult result = ((PsiAnonymousClass)aClass).getBaseClassType().resolveGenerics(); - final PsiClass baseClass = result.getElement(); - LOG.assertTrue(baseClass != null); - final PsiTypeParameter typeParameter = baseClass.getTypeParameters()[changeIdx]; - - final TemplateBuilderImpl templateBuilder = (TemplateBuilderImpl)TemplateBuilderFactory.getInstance().createTemplateBuilder(aClass); - - final String oldTypeText = typeElement.getText(); - final String varName = "param"; - templateBuilder.replaceElement(typeElement, varName, new TypeExpression(project, new PsiType[]{typeElement.getType()}), true); - - final Template template = templateBuilder.buildInlineTemplate(); - TemplateManager.getInstance(project).startTemplate(editor, template, false, null, new TemplateEditingAdapter() { - private String myNewType; - - @Override - public void beforeTemplateFinished(TemplateState state, Template template) { - final TextResult value = state.getVariableValue(varName); - myNewType = value != null ? value.getText() : ""; - final int segmentsCount = state.getSegmentsCount(); - final Document document = state.getEditor().getDocument(); - for (int i = 0; i < segmentsCount; i++) { - final TextRange segmentRange = state.getSegmentRange(i); - document.replaceString(segmentRange.getStartOffset(), segmentRange.getEndOffset(), oldTypeText); - } - } - - @Override - public void templateFinished(Template template, boolean brokenOff) { - if (!brokenOff) { - final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(project); - try { - final PsiType targetParam = elementFactory.createTypeFromText(myNewType, aClass); - final TypeMigrationRules myRules = new TypeMigrationRules(((PsiAnonymousClass)aClass).getBaseClassType()); - final PsiSubstitutor substitutor = result.getSubstitutor().put(typeParameter, targetParam); - final PsiType targetClassType = elementFactory.createType(baseClass, substitutor); - myRules.setMigrationRootType(targetClassType); - myRules.setBoundScope(new LocalSearchScope(aClass)); - new TypeMigrationProcessor(project, ((PsiAnonymousClass)aClass).getBaseClassReference().getParameterList(), myRules).run(); - } - catch (IncorrectOperationException e) { - HintManager.getInstance().showErrorHint(editor, "Incorrect type"); - } - } - } - }); - } - } - } - - @Override - public boolean startInWriteAction() { - return true; - } -} diff --git a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToAtomicIntention.java b/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToAtomicIntention.java deleted file mode 100644 index d794d59f9943..000000000000 --- a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToAtomicIntention.java +++ /dev/null @@ -1,218 +0,0 @@ -package com.intellij.refactoring.typeMigration.intentions; - -import com.intellij.codeInsight.FileModificationService; -import com.intellij.codeInsight.intention.LowPriorityAction; -import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction; -import com.intellij.lang.java.JavaLanguage; -import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.editor.Editor; -import com.intellij.openapi.project.Project; -import com.intellij.psi.*; -import com.intellij.psi.codeStyle.CodeStyleSettingsManager; -import com.intellij.psi.codeStyle.JavaCodeStyleManager; -import com.intellij.psi.impl.AllowedApiFilterExtension; -import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.psi.search.searches.ReferencesSearch; -import com.intellij.psi.tree.IElementType; -import com.intellij.psi.util.PsiUtil; -import com.intellij.psi.util.TypeConversionUtil; -import com.intellij.refactoring.typeMigration.TypeConversionDescriptor; -import com.intellij.refactoring.typeMigration.TypeMigrationReplacementUtil; -import com.intellij.refactoring.typeMigration.rules.AtomicConversionRule; -import com.intellij.util.IncorrectOperationException; -import com.intellij.util.Query; -import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.NotNull; - -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.*; - -import static com.intellij.psi.util.TypeConversionUtil.isBinaryOperatorApplicable; -import static com.intellij.util.ObjectUtils.assertNotNull; - -/** - * @author anna - * @since 26-Aug-2009 - */ -public class ConvertFieldToAtomicIntention extends PsiElementBaseIntentionAction implements LowPriorityAction { - private static final Logger LOG = Logger.getInstance("#" + ConvertFieldToAtomicIntention.class.getName()); - - private final Map<PsiType, String> myFromToMap = ContainerUtil.newHashMap(); - { - myFromToMap.put(PsiType.INT, AtomicInteger.class.getName()); - myFromToMap.put(PsiType.LONG, AtomicLong.class.getName()); - myFromToMap.put(PsiType.BOOLEAN, AtomicBoolean.class.getName()); - myFromToMap.put(PsiType.INT.createArrayType(), AtomicIntegerArray.class.getName()); - myFromToMap.put(PsiType.LONG.createArrayType(), AtomicLongArray.class.getName()); - } - - @NotNull - @Override - public String getText() { - return "Convert to atomic"; - } - - @NotNull - @Override - public String getFamilyName() { - return getText(); - } - - @Override - public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) { - PsiVariable psiVariable = getVariable(element); - if (psiVariable == null || psiVariable instanceof PsiResourceVariable) return false; - if (psiVariable.getLanguage() != JavaLanguage.INSTANCE) return false; - if (psiVariable.getTypeElement() == null) return false; - if (!PsiUtil.isLanguageLevel5OrHigher(psiVariable)) return false; - final PsiType psiType = psiVariable.getType(); - final PsiClass psiTypeClass = PsiUtil.resolveClassInType(psiType); - if (psiTypeClass != null) { - final String qualifiedName = psiTypeClass.getQualifiedName(); - if (qualifiedName != null) { //is already atomic - if (myFromToMap.values().contains(qualifiedName) || - qualifiedName.equals(AtomicReference.class.getName()) || - qualifiedName.equals(AtomicReferenceArray.class.getName())) { - return false; - } - } - } - else if (!myFromToMap.containsKey(psiType)) { - return false; - } - return AllowedApiFilterExtension.isClassAllowed(AtomicReference.class.getName(), element); - } - - private static PsiVariable getVariable(PsiElement element) { - if (element instanceof PsiIdentifier) { - final PsiElement parent = element.getParent(); - if (parent instanceof PsiLocalVariable || parent instanceof PsiField) { - return (PsiVariable)parent; - } - } - return null; - } - - @Override - public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) throws IncorrectOperationException { - final PsiVariable psiVariable = getVariable(element); - LOG.assertTrue(psiVariable != null); - - final Query<PsiReference> refs = ReferencesSearch.search(psiVariable); - - final Set<PsiElement> elements = new HashSet<PsiElement>(); - elements.add(element); - for (PsiReference reference : refs) { - elements.add(reference.getElement()); - } - if (!FileModificationService.getInstance().preparePsiElementsForWrite(elements)) return; - - final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project); - final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project); - final PsiType fromType = psiVariable.getType(); - PsiClassType toType; - final String atomicQualifiedName = myFromToMap.get(fromType); - if (atomicQualifiedName != null) { - final PsiClass atomicClass = psiFacade.findClass(atomicQualifiedName, GlobalSearchScope.allScope(project)); - if (atomicClass == null) {//show warning - return; - } - toType = factory.createType(atomicClass); - } - else if (fromType instanceof PsiArrayType) { - final PsiClass atomicReferenceArrayClass = - psiFacade.findClass(AtomicReferenceArray.class.getName(), GlobalSearchScope.allScope(project)); - if (atomicReferenceArrayClass == null) {//show warning - return; - } - final Map<PsiTypeParameter, PsiType> substitutor = ContainerUtil.newHashMap(); - final PsiTypeParameter[] typeParameters = atomicReferenceArrayClass.getTypeParameters(); - if (typeParameters.length == 1) { - PsiType componentType = ((PsiArrayType)fromType).getComponentType(); - if (componentType instanceof PsiPrimitiveType) componentType = ((PsiPrimitiveType)componentType).getBoxedType(element); - substitutor.put(typeParameters[0], componentType); - } - toType = factory.createType(atomicReferenceArrayClass, factory.createSubstitutor(substitutor)); - } - else { - final PsiClass atomicReferenceClass = psiFacade.findClass(AtomicReference.class.getName(), GlobalSearchScope.allScope(project)); - if (atomicReferenceClass == null) {//show warning - return; - } - final Map<PsiTypeParameter, PsiType> substitutor = ContainerUtil.newHashMap(); - final PsiTypeParameter[] typeParameters = atomicReferenceClass.getTypeParameters(); - if (typeParameters.length == 1) { - PsiType type = fromType; - if (type instanceof PsiPrimitiveType) type = ((PsiPrimitiveType)fromType).getBoxedType(element); - substitutor.put(typeParameters[0], type); - } - toType = factory.createType(atomicReferenceClass, factory.createSubstitutor(substitutor)); - } - - try { - for (PsiReference reference : refs) { - PsiElement psiElement = reference.getElement(); - if (psiElement instanceof PsiExpression) { - final PsiElement parent = psiElement.getParent(); - if (parent instanceof PsiExpression && !(parent instanceof PsiReferenceExpression || parent instanceof PsiPolyadicExpression)) { - psiElement = parent; - } - if (psiElement instanceof PsiBinaryExpression) { - PsiBinaryExpression binary = (PsiBinaryExpression)psiElement; - if (isBinaryOperatorApplicable(binary.getOperationTokenType(), binary.getLOperand(), binary.getROperand(), true)) { - continue; - } - } - else if (psiElement instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignment = (PsiAssignmentExpression)psiElement; - final IElementType opSign = TypeConversionUtil.convertEQtoOperation(assignment.getOperationTokenType()); - if (opSign != null && isBinaryOperatorApplicable(opSign, assignment.getLExpression(), assignment.getRExpression(), true)) { - continue; - } - } - final TypeConversionDescriptor directConversion = AtomicConversionRule.findDirectConversion(psiElement, toType, fromType); - if (directConversion != null) { - TypeMigrationReplacementUtil.replaceExpression((PsiExpression)psiElement, project, directConversion); - } - } - } - - final PsiExpression initializer = psiVariable.getInitializer(); - if (initializer != null) { - final TypeConversionDescriptor directConversion = AtomicConversionRule.wrapWithNewExpression(toType, fromType, null, element); - if (directConversion != null) { - TypeMigrationReplacementUtil.replaceExpression(initializer, project, directConversion); - } - } - else if (!assertNotNull(psiVariable.getModifierList()).hasModifierProperty(PsiModifier.FINAL)) { - final PsiExpression newInitializer = factory.createExpressionFromText("new " + toType.getCanonicalText() + "()", psiVariable); - if (psiVariable instanceof PsiLocalVariable) { - ((PsiLocalVariable)psiVariable).setInitializer(newInitializer); - } - else if (psiVariable instanceof PsiField) { - ((PsiField)psiVariable).setInitializer(newInitializer); - } - JavaCodeStyleManager.getInstance(project).shortenClassReferences(psiVariable.getInitializer()); - } - - PsiElement replaced = assertNotNull(psiVariable.getTypeElement()).replace(factory.createTypeElement(toType)); - JavaCodeStyleManager.getInstance(project).shortenClassReferences(replaced); - - if (psiVariable instanceof PsiField || CodeStyleSettingsManager.getSettings(project).GENERATE_FINAL_LOCALS) { - final PsiModifierList modifierList = assertNotNull(psiVariable.getModifierList()); - modifierList.setModifierProperty(PsiModifier.FINAL, true); - modifierList.setModifierProperty(PsiModifier.VOLATILE, false); - } - } - catch (IncorrectOperationException e) { - LOG.error(e); - } - } - - @Override - public boolean startInWriteAction() { - return true; - } -} diff --git a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToThreadLocalIntention.java b/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToThreadLocalIntention.java deleted file mode 100644 index e01aaadae7d8..000000000000 --- a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToThreadLocalIntention.java +++ /dev/null @@ -1,145 +0,0 @@ -/* - * User: anna - * Date: 26-Aug-2009 - */ -package com.intellij.refactoring.typeMigration.intentions; - -import com.intellij.codeInsight.FileModificationService; -import com.intellij.codeInsight.intention.LowPriorityAction; -import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction; -import com.intellij.lang.java.JavaLanguage; -import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.editor.Editor; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.Comparing; -import com.intellij.psi.*; -import com.intellij.psi.codeStyle.CodeStyleManager; -import com.intellij.psi.impl.AllowedApiFilterExtension; -import com.intellij.psi.impl.PsiDiamondTypeUtil; -import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.psi.search.searches.ReferencesSearch; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; -import com.intellij.refactoring.typeMigration.TypeConversionDescriptor; -import com.intellij.refactoring.typeMigration.TypeMigrationLabeler; -import com.intellij.refactoring.typeMigration.TypeMigrationReplacementUtil; -import com.intellij.refactoring.typeMigration.TypeMigrationRules; -import com.intellij.refactoring.typeMigration.rules.ThreadLocalConversionRule; -import com.intellij.util.IncorrectOperationException; -import com.intellij.util.Query; -import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.NotNull; - -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import static com.intellij.util.ObjectUtils.assertNotNull; - -public class ConvertFieldToThreadLocalIntention extends PsiElementBaseIntentionAction implements LowPriorityAction { - private static final Logger LOG = Logger.getInstance("#" + ConvertFieldToThreadLocalIntention.class.getName()); - - @NotNull - @Override - public String getText() { - return "Convert to ThreadLocal"; - } - - @NotNull - @Override - public String getFamilyName() { - return getText(); - } - - @Override - public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) { - if (!(element instanceof PsiIdentifier)) return false; - final PsiField psiField = PsiTreeUtil.getParentOfType(element, PsiField.class); - if (psiField == null) return false; - if (psiField.getLanguage() != JavaLanguage.INSTANCE) return false; - if (psiField.getTypeElement() == null) return false; - final PsiType fieldType = psiField.getType(); - final PsiClass fieldTypeClass = PsiUtil.resolveClassInType(fieldType); - if (fieldType instanceof PsiPrimitiveType || fieldType instanceof PsiArrayType) return true; - return fieldTypeClass != null && !Comparing.strEqual(fieldTypeClass.getQualifiedName(), ThreadLocal.class.getName()) - && AllowedApiFilterExtension.isClassAllowed(ThreadLocal.class.getName(), element); - } - - @Override - public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) throws IncorrectOperationException { - final PsiField psiField = PsiTreeUtil.getParentOfType(element, PsiField.class); - LOG.assertTrue(psiField != null); - final Query<PsiReference> refs = ReferencesSearch.search(psiField); - - final Set<PsiElement> elements = new HashSet<PsiElement>(); - elements.add(element); - for (PsiReference reference : refs) { - elements.add(reference.getElement()); - } - if (!FileModificationService.getInstance().preparePsiElementsForWrite(elements)) return; - - final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project); - final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project); - final PsiType fromType = psiField.getType(); - - final PsiClass threadLocalClass = psiFacade.findClass(ThreadLocal.class.getName(), GlobalSearchScope.allScope(project)); - if (threadLocalClass == null) {//show warning - return; - } - final Map<PsiTypeParameter, PsiType> substitutor = ContainerUtil.newHashMap(); - final PsiTypeParameter[] typeParameters = threadLocalClass.getTypeParameters(); - if (typeParameters.length == 1) { - PsiType type = fromType; - if (fromType instanceof PsiPrimitiveType) type = ((PsiPrimitiveType)fromType).getBoxedType(element); - substitutor.put(typeParameters[0], type); - } - final PsiClassType toType = factory.createType(threadLocalClass, factory.createSubstitutor(substitutor)); - - try { - final TypeMigrationRules rules = new TypeMigrationRules(fromType); - rules.setMigrationRootType(toType); - rules.setBoundScope(GlobalSearchScope.fileScope(element.getContainingFile())); - final TypeMigrationLabeler labeler = new TypeMigrationLabeler(rules); - labeler.getMigratedUsages(false, psiField); - for (PsiReference reference : refs) { - PsiElement psiElement = reference.getElement(); - if (psiElement instanceof PsiExpression) { - final PsiElement parent = psiElement.getParent(); - if (parent instanceof PsiExpression && !(parent instanceof PsiReferenceExpression || parent instanceof PsiPolyadicExpression)) { - psiElement = parent; - } - final TypeConversionDescriptor conversion = ThreadLocalConversionRule.findDirectConversion(psiElement, toType, fromType, labeler); - if (conversion != null) { - TypeMigrationReplacementUtil.replaceExpression((PsiExpression)psiElement, project, conversion); - } - } - } - - final PsiExpression initializer = psiField.getInitializer(); - if (initializer != null) { - final TypeConversionDescriptor conversion = ThreadLocalConversionRule.wrapWithNewExpression(toType, fromType, initializer); - TypeMigrationReplacementUtil.replaceExpression(initializer, project, conversion); - CodeStyleManager.getInstance(project).reformat(psiField); - } - else if (!assertNotNull(psiField.getModifierList()).hasModifierProperty(PsiModifier.FINAL)) { - final String text = "new " + PsiDiamondTypeUtil.getCollapsedType(toType, psiField) + "()"; - final PsiExpression newInitializer = factory.createExpressionFromText(text, psiField); - psiField.setInitializer(newInitializer); - } - - assertNotNull(psiField.getTypeElement()).replace(factory.createTypeElement(toType)); - - final PsiModifierList modifierList = assertNotNull(psiField.getModifierList()); - modifierList.setModifierProperty(PsiModifier.FINAL, true); - modifierList.setModifierProperty(PsiModifier.VOLATILE, false); - } - catch (IncorrectOperationException e) { - LOG.error(e); - } - } - - @Override - public boolean startInWriteAction() { - return true; - } -} diff --git a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/rules/AtomicConversionRule.java b/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/rules/AtomicConversionRule.java deleted file mode 100644 index a4ec46e44838..000000000000 --- a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/rules/AtomicConversionRule.java +++ /dev/null @@ -1,420 +0,0 @@ -/* - * User: anna - * Date: 18-Aug-2009 - */ -package com.intellij.refactoring.typeMigration.rules; - -import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.util.Comparing; -import com.intellij.psi.*; -import com.intellij.psi.impl.PsiDiamondTypeUtil; -import com.intellij.psi.tree.IElementType; -import com.intellij.psi.util.PsiUtil; -import com.intellij.psi.util.TypeConversionUtil; -import com.intellij.refactoring.typeMigration.TypeConversionDescriptor; -import com.intellij.refactoring.typeMigration.TypeConversionDescriptorBase; -import com.intellij.refactoring.typeMigration.TypeMigrationLabeler; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.concurrent.atomic.*; - -public class AtomicConversionRule extends TypeConversionRule { - private static final Logger LOG = Logger.getInstance("#" + AtomicConversionRule.class.getName()); - - - @Override - public TypeConversionDescriptorBase findConversion(PsiType from, - PsiType to, - PsiMember member, - PsiExpression context, - TypeMigrationLabeler labeler) { - if (to instanceof PsiClassType && isAtomicTypeMigration(from, (PsiClassType)to, context)) { - return findDirectConversion(context, to, from); - } - else if (from instanceof PsiClassType && isAtomicTypeMigration(to, (PsiClassType)from, context)) { - return findReverseConversion(context); - } - return null; - } - - private static boolean isAtomicTypeMigration(PsiType from, PsiClassType to, PsiExpression context) { - if (from == PsiType.INT && to.getCanonicalText().equals(AtomicInteger.class.getName())) { - return true; - } - if (from.equals(PsiType.INT.createArrayType()) && to.getCanonicalText().equals(AtomicIntegerArray.class.getName())) { - return true; - } - if (from == PsiType.LONG && to.getCanonicalText().equals(AtomicLong.class.getName())) { - return true; - } - if (from.equals(PsiType.LONG.createArrayType()) && to.getCanonicalText().equals(AtomicLongArray.class.getName())) { - return true; - } - if (from == PsiType.BOOLEAN && to.getCanonicalText().equals(AtomicBoolean.class.getName())) { - return true; - } - final PsiClassType.ClassResolveResult resolveResult = PsiUtil.resolveGenericsClassInType(to); - final PsiClass atomicClass = resolveResult.getElement(); - - if (atomicClass != null) { - final String typeQualifiedName = atomicClass.getQualifiedName(); - if (!Comparing.strEqual(typeQualifiedName, AtomicReference.class.getName()) && - !Comparing.strEqual(typeQualifiedName, AtomicReferenceArray.class.getName())) { - return false; - } - final PsiTypeParameter[] typeParameters = atomicClass.getTypeParameters(); - if (typeParameters.length != 1) return false; - final PsiType toTypeParameterValue = resolveResult.getSubstitutor().substitute(typeParameters[0]); - if (toTypeParameterValue != null) { - if (from.getDeepComponentType() instanceof PsiPrimitiveType) { - final PsiPrimitiveType unboxedInitialType = PsiPrimitiveType.getUnboxedType(toTypeParameterValue); - if (unboxedInitialType != null) { - return TypeConversionUtil.areTypesConvertible(from.getDeepComponentType(), unboxedInitialType); - } - } - else { - return TypeConversionUtil.isAssignable(from.getDeepComponentType(), PsiUtil.captureToplevelWildcards(toTypeParameterValue, context)); - } - } - } - return false; - } - - @Nullable - public static TypeConversionDescriptor findDirectConversion(PsiElement context, PsiType to, PsiType from) { - final PsiClass toTypeClass = PsiUtil.resolveClassInType(to); - LOG.assertTrue(toTypeClass != null); - final String qualifiedName = toTypeClass.getQualifiedName(); - if (qualifiedName != null) { - if (qualifiedName.equals(AtomicInteger.class.getName()) || qualifiedName.equals(AtomicLong.class.getName())) { - - if (context instanceof PsiPostfixExpression) { - final IElementType operationSign = ((PsiPostfixExpression)context).getOperationTokenType(); - if (operationSign == JavaTokenType.MINUSMINUS) { - return new TypeConversionDescriptor("$qualifier$--", "$qualifier$.getAndDecrement()"); - } - if (operationSign == JavaTokenType.PLUSPLUS) { - return new TypeConversionDescriptor("$qualifier$++", "$qualifier$.getAndIncrement()"); - } - - } - else if (context instanceof PsiPrefixExpression) { - final IElementType operationSign = ((PsiPrefixExpression)context).getOperationTokenType(); - if (operationSign == JavaTokenType.MINUSMINUS) { - return new TypeConversionDescriptor("--$qualifier$", "$qualifier$.decrementAndGet()"); - } - if (operationSign == JavaTokenType.PLUSPLUS) { - return new TypeConversionDescriptor("++$qualifier$", "$qualifier$.incrementAndGet()"); - } - - } - else if (context instanceof PsiAssignmentExpression) { - final PsiJavaToken signToken = ((PsiAssignmentExpression)context).getOperationSign(); - final IElementType operationSign = signToken.getTokenType(); - final String sign = signToken.getText(); - if (operationSign == JavaTokenType.PLUSEQ || operationSign == JavaTokenType.MINUSEQ) { - return new TypeConversionDescriptor("$qualifier$ " + sign + " $val$", "$qualifier$.getAndAdd(" + - (operationSign == JavaTokenType.MINUSEQ ? "-" : "") + - "($val$))"); - } - } - } - else if (qualifiedName.equals(AtomicIntegerArray.class.getName()) || qualifiedName.equals(AtomicLongArray.class.getName())) { - PsiElement parentExpression = context.getParent(); - if (parentExpression instanceof PsiPostfixExpression) { - final IElementType operationSign = ((PsiPostfixExpression)parentExpression).getOperationTokenType(); - if (operationSign == JavaTokenType.MINUSMINUS) { - return new TypeConversionDescriptor("$qualifier$[$idx$]--", "$qualifier$.getAndDecrement($idx$)", - (PsiExpression)parentExpression); - } - if (operationSign == JavaTokenType.PLUSPLUS) { - return new TypeConversionDescriptor("$qualifier$[$idx$]++", "$qualifier$.getAndIncrement($idx$)", - (PsiExpression)parentExpression); - } - - } - else if (parentExpression instanceof PsiPrefixExpression) { - final IElementType operationSign = ((PsiPrefixExpression)parentExpression).getOperationTokenType(); - if (operationSign == JavaTokenType.MINUSMINUS) { - return new TypeConversionDescriptor("--$qualifier$[$idx$]", "$qualifier$.decrementAndGet($idx$)", - (PsiExpression)parentExpression); - } - if (operationSign == JavaTokenType.PLUSPLUS) { - return new TypeConversionDescriptor("++$qualifier$[$idx$]", "$qualifier$.incrementAndGet($idx$)", - (PsiExpression)parentExpression); - } - - } - else if (parentExpression instanceof PsiAssignmentExpression) { - final PsiJavaToken signToken = ((PsiAssignmentExpression)parentExpression).getOperationSign(); - final IElementType operationSign = signToken.getTokenType(); - final String sign = signToken.getText(); - if (operationSign == JavaTokenType.PLUSEQ || operationSign == JavaTokenType.MINUSEQ) { - return new TypeConversionDescriptor("$qualifier$[$idx$] " + sign + " $val$", "$qualifier$.getAndAdd($idx$, " + - (operationSign == JavaTokenType.MINUSEQ - ? "-" - : "") + - "($val$))", (PsiExpression)parentExpression); - } - } - } - } - return from instanceof PsiArrayType - ? findDirectConversionForAtomicReferenceArray(context, to, from) - : findDirectConversionForAtomicReference(context, to, from); - } - - @Nullable - private static TypeConversionDescriptor findDirectConversionForAtomicReference(PsiElement context, PsiType to, PsiType from) { - final PsiElement parent = context.getParent(); - if (parent instanceof PsiAssignmentExpression) { - final IElementType operationSign = ((PsiAssignmentExpression)parent).getOperationTokenType(); - if (operationSign == JavaTokenType.EQ) { - return new TypeConversionDescriptor("$qualifier$ = $val$", "$qualifier$.set($val$)", (PsiAssignmentExpression)parent); - } - } - - if (context instanceof PsiReferenceExpression) { - final PsiExpression qualifierExpression = ((PsiReferenceExpression)context).getQualifierExpression(); - final PsiExpression expression = context.getParent() instanceof PsiMethodCallExpression && qualifierExpression != null - ? qualifierExpression - : (PsiExpression)context; - return new TypeConversionDescriptor("$qualifier$", "$qualifier$.get()", expression); - } - else if (context instanceof PsiAssignmentExpression) { - final PsiJavaToken signToken = ((PsiAssignmentExpression)context).getOperationSign(); - final IElementType operationSign = signToken.getTokenType(); - final String sign = signToken.getText(); - if (parent instanceof PsiExpressionStatement) { - if (operationSign == JavaTokenType.EQ) { - final PsiExpression lExpression = ((PsiAssignmentExpression)context).getLExpression(); - if (lExpression instanceof PsiReferenceExpression) { - final PsiElement element = ((PsiReferenceExpression)lExpression).resolve(); - if (element instanceof PsiVariable && ((PsiVariable)element).hasModifierProperty(PsiModifier.FINAL)) { - return wrapWithNewExpression(to, from, ((PsiAssignmentExpression)context).getRExpression(), element); - } - } - return new TypeConversionDescriptor("$qualifier$ = $val$", "$qualifier$.set($val$)"); - } - else { - return new TypeConversionDescriptor("$qualifier$" + sign + "$val$", "$qualifier$.set(" + - getBoxedWrapper(from, to, "$qualifier$.get() " + - sign.charAt(0) + - " $val$") + - ")"); - } - } //else should be a conflict - } - else if (context instanceof PsiPostfixExpression) { - final String sign = ((PsiPostfixExpression)context).getOperationSign().getText(); - return new TypeConversionDescriptor("$qualifier$" + sign, "$qualifier$.getAndSet(" + - getBoxedWrapper(from, to, "$qualifier$.get() " + sign.charAt(0) + " 1") + - ")"); - } - else if (context instanceof PsiPrefixExpression) { - final PsiJavaToken operationSign = ((PsiPrefixExpression)context).getOperationSign(); - if (operationSign.getTokenType() == JavaTokenType.EXCL) { - return new TypeConversionDescriptor("!$qualifier$", "!$qualifier$.get()"); - } - final String sign = operationSign.getText(); - return new TypeConversionDescriptor(sign + "$qualifier$", "$qualifier$.set(" + //todo reject? - getBoxedWrapper(from, to, "$qualifier$.get() " + sign.charAt(0) + " 1") + - ")"); - } else if (context instanceof PsiBinaryExpression) { - final String sign = ((PsiBinaryExpression)context).getOperationSign().getText(); - return new TypeConversionDescriptor("$qualifier$" + sign + "$val$", "$qualifier$.get() " + sign + " $val$"); - } - - if (parent instanceof PsiVariable) { - return wrapWithNewExpression(to, from, null, parent); - } - return null; - } - - public static TypeConversionDescriptor wrapWithNewExpression(PsiType to, PsiType from, @Nullable PsiExpression expression, PsiElement context) { - final String typeText = PsiDiamondTypeUtil.getCollapsedType(to, context); - final PsiClassType.ClassResolveResult resolveResult = PsiUtil.resolveGenericsClassInType(to); - final PsiClass atomicClass = resolveResult.getElement(); - LOG.assertTrue(atomicClass != null); - final PsiTypeParameter[] typeParameters = atomicClass.getTypeParameters(); - if (typeParameters.length == 1) { - final PsiType initial = resolveResult.getSubstitutor().substitute(typeParameters[0]); - final PsiPrimitiveType unboxedInitialType = PsiPrimitiveType.getUnboxedType(initial); - if (unboxedInitialType != null) { - LOG.assertTrue(initial != null); - if (from instanceof PsiPrimitiveType) { - final PsiClassType boxedFromType = ((PsiPrimitiveType)from).getBoxedType(atomicClass); - LOG.assertTrue(boxedFromType != null); - if (!TypeConversionUtil.isAssignable(initial, boxedFromType)) { - return new TypeConversionDescriptor("$val$", "new " + typeText + "((" + unboxedInitialType.getCanonicalText() + ")$val$)", expression); - } - } - } - } - return new TypeConversionDescriptor("$val$", "new " + typeText + "($val$)", expression); - } - - @Nullable - private static TypeConversionDescriptor findDirectConversionForAtomicReferenceArray(PsiElement context, PsiType to, PsiType from) { - LOG.assertTrue(from instanceof PsiArrayType); - from = ((PsiArrayType)from).getComponentType(); - final PsiElement parent = context.getParent(); - final PsiElement parentParent = parent.getParent(); - - if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; - final IElementType operationSign = assignmentExpression.getOperationTokenType(); - final String sign = assignmentExpression.getOperationSign().getText(); - if (context instanceof PsiArrayAccessExpression) { - if (parentParent instanceof PsiExpressionStatement) { - if (assignmentExpression.getLExpression() == context) { - if (operationSign == JavaTokenType.EQ) { - return new TypeConversionDescriptor("$qualifier$[$idx$] = $val$", "$qualifier$.set($idx$, $val$)", assignmentExpression); - } - else { - return new TypeConversionDescriptor("$qualifier$[$idx$]" + sign + "$val$", - "$qualifier$.set($idx$, " + getBoxedWrapper(from, to, "$qualifier$.get($idx$) " + sign.charAt(0) + " $val$") + ")", - assignmentExpression); - } - } - } //else should be a conflict - } - else { - final PsiExpression rExpression = assignmentExpression.getRExpression(); - if (rExpression == context && operationSign == JavaTokenType.EQ) { //array = new T[l]; - return wrapWithNewExpression(to, from, rExpression, context); - } - } - } else if (parent instanceof PsiVariable) { - if (((PsiVariable)parent).getInitializer() == context) { - return wrapWithNewExpression(to, from, (PsiExpression)context, context); - } - } - - if (parentParent instanceof PsiExpressionStatement) { - if (parent instanceof PsiPostfixExpression) { - final String sign = ((PsiPostfixExpression)parent).getOperationSign().getText(); - return new TypeConversionDescriptor("$qualifier$[$idx$]" + sign, "$qualifier$.getAndSet($idx$, " + - getBoxedWrapper(from, to, - "$qualifier$.get($idx$) " + sign.charAt(0) + " 1") + - ")", (PsiExpression)parent); - } - else if (parent instanceof PsiPrefixExpression) { - final String sign = ((PsiPrefixExpression)parent).getOperationSign().getText(); - return new TypeConversionDescriptor(sign + "$qualifier$[$idx$]", "$qualifier$.set($idx$, " + - getBoxedWrapper(from, to, - "$qualifier$.get($idx$) " + sign.charAt(0) + " 1") + - ")", (PsiExpression)parent); - } - else if (parent instanceof PsiBinaryExpression) { - final String sign = ((PsiBinaryExpression)parent).getOperationSign().getText(); - return new TypeConversionDescriptor("$qualifier$[$idx$]" + sign + "$val$", "$qualifier$.set($idx$, " + - getBoxedWrapper(from, to, "$qualifier$.get($idx$) " + - sign + - " $val$)") + - ")", (PsiExpression)parent); - } - } - - if (context instanceof PsiArrayAccessExpression) { - return new TypeConversionDescriptor("$qualifier$[$idx$]", "$qualifier$.get($idx$)", (PsiExpression)context); - } - return null; - } - - private static String getBoxedWrapper(final PsiType from, final PsiType to, @NotNull String arg) { - final PsiClassType.ClassResolveResult resolveResult = PsiUtil.resolveGenericsClassInType(to); - final PsiClass atomicClass = resolveResult.getElement(); - LOG.assertTrue(atomicClass != null); - final PsiTypeParameter[] typeParameters = atomicClass.getTypeParameters(); - if (typeParameters.length == 1) { - final PsiSubstitutor substitutor = resolveResult.getSubstitutor(); - LOG.assertTrue(substitutor.isValid()); - final PsiType initial = substitutor.substitute(typeParameters[0]); - final PsiPrimitiveType unboxedInitialType = PsiPrimitiveType.getUnboxedType(initial); - if (unboxedInitialType != null) { - LOG.assertTrue(initial != null); - if (from instanceof PsiPrimitiveType) { - final PsiClassType boxedFromType = ((PsiPrimitiveType)from).getBoxedType(atomicClass); - LOG.assertTrue(boxedFromType != null); - return "new " + initial.getPresentableText() + "((" + unboxedInitialType.getCanonicalText() + ")(" + arg + "))"; - } - } - } - return arg; - } - - @Nullable - private static TypeConversionDescriptor findReverseConversion(PsiElement context) { - if (context instanceof PsiReferenceExpression) { - if (context.getParent() instanceof PsiMethodCallExpression) { - return findReverseConversionForMethodCall(context); - } - } - else if (context instanceof PsiNewExpression) { - return new TypeConversionDescriptor("new $type$($qualifier$)", "$qualifier$"); - } - else if (context instanceof PsiMethodCallExpression) { - return findReverseConversionForMethodCall(((PsiMethodCallExpression)context).getMethodExpression()); - } - return null; - } - - @Nullable - private static TypeConversionDescriptor findReverseConversionForMethodCall(PsiElement context) { - final PsiElement resolved = ((PsiReferenceExpression)context).resolve(); - if (resolved instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)resolved; - final int parametersCount = method.getParameterList().getParametersCount(); - final String resolvedName = method.getName(); - if (Comparing.strEqual(resolvedName, "get")) { - return parametersCount == 0 ? - new TypeConversionDescriptor("$qualifier$.get()", "$qualifier$") : - new TypeConversionDescriptor("$qualifier$.get($idx$)", "$qualifier$[$idx$]"); - } - else if (Comparing.strEqual(resolvedName, "set")) { - return parametersCount == 1 ? - new TypeConversionDescriptor("$qualifier$.set($val$)", "$qualifier$ = $val$") : - new TypeConversionDescriptor("$qualifier$.set($idx$, $val$)", "$qualifier$[$idx$] = $val$"); - } - else if (Comparing.strEqual(resolvedName, "addAndGet")) { - return parametersCount == 1 ? - new TypeConversionDescriptor("$qualifier$.addAndGet($delta$)", "$qualifier$ + $delta$") : - new TypeConversionDescriptor("$qualifier$.addAndGet($idx$, $delta$)", "$qualifier$[$idx$] + $delta$"); - } - else if (Comparing.strEqual(resolvedName, "incrementAndGet")) { - return parametersCount == 0 ? - new TypeConversionDescriptor("$qualifier$.incrementAndGet()", "++$qualifier$") : - new TypeConversionDescriptor("$qualifier$.incrementAndGet($idx$)", "++$qualifier$[$idx$]"); - } - else if (Comparing.strEqual(resolvedName, "decrementAndGet")) { - return parametersCount == 0 ? - new TypeConversionDescriptor("$qualifier$.decrementAndGet()", "--$qualifier$") : - new TypeConversionDescriptor("$qualifier$.decrementAndGet($idx$)", "--$qualifier$[$idx$]"); - } - else if (Comparing.strEqual(resolvedName, "getAndIncrement")) { - return parametersCount == 0 ? - new TypeConversionDescriptor("$qualifier$.getAndIncrement()", "$qualifier$++") : - new TypeConversionDescriptor("$qualifier$.getAndIncrement($idx$)", "$qualifier$[$idx$]++"); - } - else if (Comparing.strEqual(resolvedName, "getAndDecrement")) { - return parametersCount == 0 ? - new TypeConversionDescriptor("$qualifier$.getAndDecrement()", "$qualifier$--") : - new TypeConversionDescriptor("$qualifier$.getAndDecrement($idx$)", "$qualifier$[$idx$]--"); - } - else if (Comparing.strEqual(resolvedName, "getAndAdd")) { - return parametersCount == 1? - new TypeConversionDescriptor("$qualifier$.getAndAdd($val$)", "$qualifier$ += $val$") : - new TypeConversionDescriptor("$qualifier$.getAndAdd($idx$, $val$)", "$qualifier$[$idx$] += $val$"); - } - else if (Comparing.strEqual(resolvedName, "getAndSet")) { - return parametersCount == 1 ? - new TypeConversionDescriptor("$qualifier$.getAndSet($val$)", "$qualifier$ = $val$") : - new TypeConversionDescriptor("$qualifier$.getAndSet($idx$, $val$)", "$qualifier$[$idx$] = $val$"); - } - } - return null; - } - -} diff --git a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/rules/BoxingTypeConversionRule.java b/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/rules/BoxingTypeConversionRule.java deleted file mode 100644 index 4353bf602e04..000000000000 --- a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/rules/BoxingTypeConversionRule.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * User: anna - * Date: 08-Aug-2008 - */ -package com.intellij.refactoring.typeMigration.rules; - -import com.intellij.openapi.util.Comparing; -import com.intellij.psi.*; -import com.intellij.psi.util.PsiUtil; -import com.intellij.refactoring.typeMigration.TypeConversionDescriptor; -import com.intellij.refactoring.typeMigration.TypeConversionDescriptorBase; -import com.intellij.refactoring.typeMigration.TypeMigrationLabeler; - -public class BoxingTypeConversionRule extends TypeConversionRule { - - public TypeConversionDescriptorBase findConversion(final PsiType from, final PsiType to, final PsiMember member, final PsiExpression context, - final TypeMigrationLabeler labeler) { - if (to instanceof PsiClassType && from instanceof PsiPrimitiveType) { - if (!PsiUtil.isLanguageLevel5OrHigher(context)) { - final String boxedTypeName = ((PsiPrimitiveType)from).getBoxedTypeName(); - if (Comparing.strEqual(boxedTypeName, to.getCanonicalText())) { - return new TypeConversionDescriptor("$qualifier$", boxedTypeName + ".valueOf($qualifier$)"); - } - } - } - else if (from instanceof PsiClassType && to instanceof PsiPrimitiveType) { - if (!PsiUtil.isLanguageLevel5OrHigher(context)) { - final String boxedTypeName = ((PsiPrimitiveType)to).getBoxedTypeName(); - if (Comparing.strEqual(boxedTypeName, from.getCanonicalText())) { - return new TypeConversionDescriptor("$qualifier$", "($qualifier$)." + to.getCanonicalText() + "Value()"); - } - } - } - return null; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ElementToArrayConversionRule.java b/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ElementToArrayConversionRule.java deleted file mode 100644 index 0d25df778bcc..000000000000 --- a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ElementToArrayConversionRule.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * User: anna - * Date: 25-Aug-2008 - */ -package com.intellij.refactoring.typeMigration.rules; - -import com.intellij.psi.*; -import com.intellij.psi.util.PsiUtil; -import com.intellij.psi.util.TypeConversionUtil; -import com.intellij.refactoring.typeMigration.TypeConversionDescriptor; -import com.intellij.refactoring.typeMigration.TypeConversionDescriptorBase; -import com.intellij.refactoring.typeMigration.TypeMigrationLabeler; - -public class ElementToArrayConversionRule extends TypeConversionRule{ - public TypeConversionDescriptorBase findConversion(final PsiType from, final PsiType to, final PsiMember member, final PsiExpression context, - final TypeMigrationLabeler labeler) { - if (member == null && to instanceof PsiArrayType && TypeConversionUtil.isAssignable(((PsiArrayType)to).getComponentType(), from)) { - TypeConversionDescriptor wrapDescription = - new TypeConversionDescriptor("$qualifier$", "new " + from.getCanonicalText() + "[]{$qualifier$}", context); - if (((PsiArrayType)to).getComponentType() instanceof PsiClassType && from instanceof PsiPrimitiveType) { - final String boxedTypeName = ((PsiPrimitiveType)from).getBoxedTypeName(); - final String normalizedArrayInitializer = - PsiUtil.isLanguageLevel5OrHigher(context) ? "$qualifier$" : boxedTypeName + ".valueOf($qualifier$)"; - wrapDescription = new TypeConversionDescriptor("$qualifier$", "new " + boxedTypeName + "[]{" + normalizedArrayInitializer + "}", context); - } - final PsiElement parent = context.getParent(); - if ((context instanceof PsiLiteralExpression || context instanceof PsiReferenceExpression) && parent instanceof PsiStatement) { - return wrapDescription; - } - if (parent instanceof PsiAssignmentExpression && ((PsiAssignmentExpression)parent).getRExpression() == context) { - return wrapDescription; - } - } - return null; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ListArrayConversionRule.java b/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ListArrayConversionRule.java deleted file mode 100644 index 0aa639ba28cb..000000000000 --- a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ListArrayConversionRule.java +++ /dev/null @@ -1,177 +0,0 @@ -/* - * User: anna - * Date: 08-Aug-2008 - */ -package com.intellij.refactoring.typeMigration.rules; - -import com.intellij.openapi.util.Pair; -import com.intellij.psi.*; -import com.intellij.psi.impl.PsiImplUtil; -import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.psi.util.InheritanceUtil; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; -import com.intellij.psi.util.TypeConversionUtil; -import com.intellij.refactoring.typeMigration.TypeConversionDescriptor; -import com.intellij.refactoring.typeMigration.TypeConversionDescriptorBase; -import com.intellij.refactoring.typeMigration.TypeMigrationLabeler; -import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.Nullable; - -public class ListArrayConversionRule extends TypeConversionRule { - public TypeConversionDescriptorBase findConversion(final PsiType from, - final PsiType to, - PsiMember member, - final PsiExpression context, - final TypeMigrationLabeler labeler) { - PsiExpression expression = context; - PsiClassType classType = from instanceof PsiClassType ? (PsiClassType)from : to instanceof PsiClassType ? (PsiClassType)to : null; - PsiArrayType arrayType = from instanceof PsiArrayType ? (PsiArrayType)from : to instanceof PsiArrayType ? (PsiArrayType)to : null; - - if (classType == null || arrayType == null) return null; - final PsiType collectionType = evaluateCollectionsType(classType, expression); - if (collectionType == null) return null; - - if (member == null) { - final PsiMethodCallExpression callExpression = PsiTreeUtil.getParentOfType(context, PsiMethodCallExpression.class); - if (callExpression != null) { - member = callExpression.resolveMethod(); - expression = callExpression; - } - } - if (member instanceof PsiMethod) { - TypeConversionDescriptor descriptor = changeCollectionCallsToArray((PsiMethod)member, context, collectionType, arrayType); - if (descriptor != null) return descriptor; - - @NonNls final String memberName = member.getName(); - assert memberName != null; - if (memberName.equals("sort")) { - if (((PsiMethod)member).getParameterList().getParametersCount() == 1) { - descriptor = new TypeConversionDescriptor("Arrays.sort($qualifier$)", "Collections.sort($qualifier$)", expression); - } - else { - descriptor = - new TypeConversionDescriptor("Arrays.sort($qualifier$, $expr$)", "Collections.sort($qualifier$, $expr$)", expression); - } - } - else if (memberName.equals("binarySearch")) { - if (((PsiMethod)member).getParameterList().getParametersCount() == 2) { - descriptor = - new TypeConversionDescriptor("Arrays.binarySearch($qualifier$, $key$)", "Collections.binarySearch($qualifier$, $key$)", - expression); - } - else { - descriptor = new TypeConversionDescriptor("Arrays.binarySearch($qualifier$, $key$, $comparator$)", - "Collections.binarySearch($qualifier$, $key$, $comparator$)", expression); - } - } - else if (memberName.equals("asList")) { - if (((PsiMethod)member).getParameterList().getParametersCount() == 1) { - descriptor = - new TypeConversionDescriptor("Arrays.asList($qualifier$)", "$qualifier$", expression); - } - } - else if (memberName.equals("fill")) { - descriptor = new TypeConversionDescriptor("Arrays.fill($qualifier$, $filler$)", "Collections.fill($qualifier$, $filler$)", expression); - } - if (descriptor != null) { - return from instanceof PsiClassType - ? new TypeConversionDescriptor(descriptor.getReplaceByString(), descriptor.getStringToReplace(), descriptor.getExpression()) - : descriptor; - } - } - - if (member instanceof PsiField && member.getName().equals("length")) { - return new TypeConversionDescriptor("$qualifier$.length", "$qualifier$.size()"); - } - - final PsiElement parent = context.getParent(); - if (parent instanceof PsiAssignmentExpression && ((PsiAssignmentExpression)parent).getLExpression() == context) { - if (TypeConversionUtil.isAssignable(collectionType, arrayType.getComponentType())) { - return new TypeConversionDescriptor("$qualifier$[$idx$] = $expr$", "$qualifier$.set($idx$, $expr$)", - (PsiExpression)parent); - } - } - else if (context instanceof PsiArrayAccessExpression && TypeConversionUtil.isAssignable(arrayType.getComponentType(), collectionType)) { - return new TypeConversionDescriptor("$qualifier$[$idx$]", "$qualifier$.get($idx$)"); - } - - return null; - } - - @Nullable - public static PsiType evaluateCollectionsType(PsiClassType classType, PsiExpression expression) { - final PsiClassType.ClassResolveResult classResolveResult = PsiUtil.resolveGenericsClassInType(classType); - if (classResolveResult != null) { - final PsiClass psiClass = classResolveResult.getElement(); - if (psiClass != null) { - final GlobalSearchScope allScope = GlobalSearchScope.allScope(psiClass.getProject()); - final PsiClass collectionClass = - JavaPsiFacade.getInstance(psiClass.getProject()).findClass(CommonClassNames.JAVA_UTIL_LIST, allScope); - if (collectionClass != null && InheritanceUtil.isInheritorOrSelf(psiClass, collectionClass, true)) { - final PsiSubstitutor derivedSubstitutor = classResolveResult.getSubstitutor(); - if (PsiUtil.isRawSubstitutor(psiClass, derivedSubstitutor)) return null; - final PsiSubstitutor substitutor = - TypeConversionUtil.getClassSubstitutor(collectionClass, psiClass, derivedSubstitutor); - assert substitutor != null; - final PsiType type = substitutor.substitute(collectionClass.getTypeParameters()[0]); - assert type != null; - return PsiImplUtil.normalizeWildcardTypeByPosition(type, expression); - } - } - } - return null; - } - - @Override - public Pair<PsiType, PsiType> bindTypeParameters(final PsiType from, - final PsiType to, - final PsiMethod method, - final PsiExpression context, - final TypeMigrationLabeler labeler) { - if (findConversion(from, to, method, context, labeler) == null) return null; - if (from instanceof PsiArrayType && to instanceof PsiClassType) { - final PsiType collectionType = evaluateCollectionsType((PsiClassType)to, context); - if (collectionType != null) { - return Pair.create(((PsiArrayType)from).getComponentType(), collectionType); - } - } - if (to instanceof PsiArrayType && from instanceof PsiClassType) { - final PsiType collectionType = evaluateCollectionsType((PsiClassType)from, context); - if (collectionType != null) { - return Pair.create(collectionType, ((PsiArrayType)to).getComponentType()); - - } - } - return null; - } - - @Nullable - private static TypeConversionDescriptor changeCollectionCallsToArray(final PsiMethod method, - final PsiElement context, - PsiType collectionType, - PsiArrayType arrayType) { - @NonNls final String methodName = method.getName(); - if (methodName.equals("toArray")) { - if (method.getParameterList().getParameters().length == 0) { - return new TypeConversionDescriptor("$qualifier$.toArray()", "$qualifier$"); - } - return new TypeConversionDescriptor("$qualifier$.toArray($expr$)", "$qualifier$"); - } - else if (methodName.equals("size")) { - return new TypeConversionDescriptor("$qualifier$.size()", "$qualifier$.length"); - } - else if (methodName.equals("get")) { - if (TypeConversionUtil.isAssignable(collectionType, arrayType.getComponentType())) { - return new TypeConversionDescriptor("$qualifier$.get($i$)", "$qualifier$[$i$]", PsiTreeUtil.getParentOfType(context, PsiMethodCallExpression.class)); - } - } - else if (methodName.equals("set")) { - if (TypeConversionUtil.isAssignable(arrayType.getComponentType(), collectionType)) { - return new TypeConversionDescriptor("$qualifier$.set($i$, $val$)", "$qualifier$[$i$] = $val$"); - } - } - return null; - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ThreadLocalConversionRule.java b/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ThreadLocalConversionRule.java deleted file mode 100644 index 2fb305147d02..000000000000 --- a/plugins/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ThreadLocalConversionRule.java +++ /dev/null @@ -1,231 +0,0 @@ -/* - * User: anna - * Date: 18-Aug-2009 - */ -package com.intellij.refactoring.typeMigration.rules; - -import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.util.Comparing; -import com.intellij.psi.*; -import com.intellij.psi.impl.PsiDiamondTypeUtil; -import com.intellij.psi.tree.IElementType; -import com.intellij.psi.util.PsiUtil; -import com.intellij.psi.util.TypeConversionUtil; -import com.intellij.refactoring.typeMigration.TypeConversionDescriptor; -import com.intellij.refactoring.typeMigration.TypeConversionDescriptorBase; -import com.intellij.refactoring.typeMigration.TypeMigrationLabeler; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -public class ThreadLocalConversionRule extends TypeConversionRule { - private static final Logger LOG = Logger.getInstance("#" + ThreadLocalConversionRule.class.getName()); - - - @Override - public TypeConversionDescriptorBase findConversion(PsiType from, - PsiType to, - PsiMember member, - PsiExpression context, - TypeMigrationLabeler labeler) { - if (to instanceof PsiClassType && isThreadLocalTypeMigration(from, (PsiClassType)to, context)) { - return findDirectConversion(context, to, from, labeler); - } - return null; - } - - private static boolean isThreadLocalTypeMigration(PsiType from, PsiClassType to, PsiExpression context) { - final PsiClassType.ClassResolveResult resolveResult = PsiUtil.resolveGenericsClassInType(to); - final PsiClass threadLocalClass = resolveResult.getElement(); - - if (threadLocalClass != null) { - final String typeQualifiedName = threadLocalClass.getQualifiedName(); - if (!Comparing.strEqual(typeQualifiedName, ThreadLocal.class.getName())) { - return false; - } - final PsiTypeParameter[] typeParameters = threadLocalClass.getTypeParameters(); - if (typeParameters.length != 1) return !PsiUtil.isLanguageLevel5OrHigher(context); - final PsiType toTypeParameterValue = resolveResult.getSubstitutor().substitute(typeParameters[0]); - if (toTypeParameterValue != null) { - if (from instanceof PsiPrimitiveType) { - final PsiPrimitiveType unboxedInitialType = PsiPrimitiveType.getUnboxedType(toTypeParameterValue); - if (unboxedInitialType != null) { - return TypeConversionUtil.areTypesConvertible(from, unboxedInitialType); - } - } - else { - return TypeConversionUtil.isAssignable(from, PsiUtil.captureToplevelWildcards(toTypeParameterValue, context)); - } - } - return !PsiUtil.isLanguageLevel5OrHigher(context); - } - return false; - } - - @Nullable - public static TypeConversionDescriptor findDirectConversion(PsiElement context, PsiType to, PsiType from, TypeMigrationLabeler labeler) { - final PsiClass toTypeClass = PsiUtil.resolveClassInType(to); - LOG.assertTrue(toTypeClass != null); - - if (context instanceof PsiArrayAccessExpression) { - return new TypeConversionDescriptor("$qualifier$[$val$]", "$qualifier$.get()[$val$]"); - } - final PsiElement parent = context.getParent(); - if (parent instanceof PsiAssignmentExpression) { - final IElementType operationSign = ((PsiAssignmentExpression)parent).getOperationTokenType(); - if (operationSign == JavaTokenType.EQ) { - return new TypeConversionDescriptor("$qualifier$ = $val$", "$qualifier$.set(" + toBoxed("$val$", from, context)+")", (PsiAssignmentExpression)parent); - } - } - - if (context instanceof PsiReferenceExpression) { - final PsiExpression qualifierExpression = ((PsiReferenceExpression)context).getQualifierExpression(); - final PsiExpression expression = context.getParent() instanceof PsiMethodCallExpression && qualifierExpression != null - ? qualifierExpression - : (PsiExpression)context; - return new TypeConversionDescriptor("$qualifier$", toPrimitive("$qualifier$.get()", from, context), expression); - } - else if (context instanceof PsiBinaryExpression) { - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)context; - final String sign = binaryExpression.getOperationSign().getText(); - return new TypeConversionDescriptor("$qualifier$" + sign + "$val$", toPrimitive("$qualifier$.get()", from, context) + " " + sign + " $val$"); - } - - if (parent instanceof PsiExpressionStatement) { - if (context instanceof PsiPostfixExpression) { - final PsiPostfixExpression postfixExpression = (PsiPostfixExpression)context; - final String sign = postfixExpression.getOperationSign().getText(); - - return new TypeConversionDescriptor("$qualifier$" + sign, "$qualifier$.set(" + - getBoxedWrapper(from, to, toPrimitive("$qualifier$.get()", from, context) + " " + sign.charAt(0) + " 1", - labeler, context, postfixExpression.getOperand().getText() + - sign.charAt(0) + - " 1") + - ")"); - } - else if (context instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)context; - final PsiJavaToken operationSign = ((PsiPrefixExpression)context).getOperationSign(); - if (operationSign.getTokenType() == JavaTokenType.EXCL) { - return new TypeConversionDescriptor("!$qualifier$", "!$qualifier$.get()"); - } - final String sign = operationSign.getText(); - final PsiExpression operand = prefixExpression.getOperand(); - return new TypeConversionDescriptor(sign + "$qualifier$", "$qualifier$.set(" + - getBoxedWrapper(from, to, toPrimitive("$qualifier$.get()", from, context) + " " + sign.charAt(0) + " 1", - labeler, context, operand != null ? operand.getText() + - sign.charAt(0) + - " 1" : null) + - ")"); - } - else if (context instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)context; - final PsiJavaToken signToken = assignmentExpression.getOperationSign(); - final IElementType operationSign = signToken.getTokenType(); - final String sign = signToken.getText(); - final PsiExpression lExpression = assignmentExpression.getLExpression(); - if (operationSign == JavaTokenType.EQ) { - if (lExpression instanceof PsiReferenceExpression) { - final PsiElement element = ((PsiReferenceExpression)lExpression).resolve(); - if (element instanceof PsiVariable && ((PsiVariable)element).hasModifierProperty(PsiModifier.FINAL)) { - return wrapWithNewExpression(to, from, ((PsiAssignmentExpression)context).getRExpression()); - } - } - return new TypeConversionDescriptor("$qualifier$ = $val$", "$qualifier$.set(" + - toBoxed("$val$", from, context) + - ")"); - } - else { - final PsiExpression rExpression = assignmentExpression.getRExpression(); - return new TypeConversionDescriptor("$qualifier$" + sign + "$val$", "$qualifier$.set(" + - getBoxedWrapper(from, to, toPrimitive("$qualifier$.get()", from, context) + - " " + sign.charAt(0) + - " $val$", labeler, context, - rExpression != null - ? lExpression - .getText() + - sign.charAt(0) + - rExpression.getText() - : null) + - ")"); - } - } - } - return null; - } - - public static TypeConversionDescriptor wrapWithNewExpression(PsiType to, PsiType from, PsiExpression initializer) { - final String boxedTypeName = from instanceof PsiPrimitiveType ? ((PsiPrimitiveType)from).getBoxedTypeName() : from.getCanonicalText(); - return new TypeConversionDescriptor("$qualifier$", "new " + - to.getCanonicalText() + - "() {\n" + - "@Override \n" + - "protected " + - boxedTypeName + - " initialValue() {\n" + - " return " + - (PsiUtil.isLanguageLevel5OrHigher(initializer) - ? initializer.getText() - : (from instanceof PsiPrimitiveType ? "new " + - ((PsiPrimitiveType)from).getBoxedTypeName() + - "(" + - initializer.getText() + - ")" : initializer.getText())) + - ";\n" + - "}\n" + - "}", initializer); - } - - private static String toPrimitive(String replaceByArg, PsiType from, PsiElement context) { - return PsiUtil.isLanguageLevel5OrHigher(context) - ? replaceByArg - : from instanceof PsiPrimitiveType ? "((" + - ((PsiPrimitiveType)from).getBoxedTypeName() + - ")" + - replaceByArg + - ")." + - from.getCanonicalText() + - "Value()" : "((" + from.getCanonicalText() + ")" + replaceByArg + ")"; - } - - private static String toBoxed(String replaceByArg, PsiType from, PsiElement context) { - return PsiUtil.isLanguageLevel5OrHigher(context) - ? replaceByArg - : from instanceof PsiPrimitiveType ? "new " + ((PsiPrimitiveType)from).getBoxedTypeName() + - "(" + - replaceByArg + - ")" - : replaceByArg; - } - - private static String getBoxedWrapper(final PsiType from, - final PsiType to, - @NotNull String arg, - TypeMigrationLabeler labeler, - PsiElement context, - @Nullable String tryType) { - if (from instanceof PsiPrimitiveType) { - final PsiClassType.ClassResolveResult resolveResult = PsiUtil.resolveGenericsClassInType(to); - final PsiClass threadLocalClass = resolveResult.getElement(); - LOG.assertTrue(threadLocalClass != null); - final PsiTypeParameter[] typeParameters = threadLocalClass.getTypeParameters(); - if (typeParameters.length == 1) { - final PsiType initial = resolveResult.getSubstitutor().substitute(typeParameters[0]); - final PsiPrimitiveType unboxedInitialType = PsiPrimitiveType.getUnboxedType(initial); - if (unboxedInitialType != null) { - LOG.assertTrue(initial != null); - if (tryType != null) { - final PsiType exprType = labeler.getTypeEvaluator().evaluateType( - JavaPsiFacade.getElementFactory(threadLocalClass.getProject()).createExpressionFromText(tryType, context)); - if (exprType != null && unboxedInitialType.isAssignableFrom(exprType)) { - return toBoxed(arg, from, context); - } - } - return "new " + initial.getCanonicalText() + "((" + unboxedInitialType.getCanonicalText() + ")(" + arg + "))"; - } - } - } - return toBoxed(arg, from, context); - } - - -}
\ No newline at end of file diff --git a/plugins/typeMigration/src/intentionDescriptions/ChangeClassParametersIntention/after.java.template b/plugins/typeMigration/src/intentionDescriptions/ChangeClassParametersIntention/after.java.template deleted file mode 100644 index 413db792c422..000000000000 --- a/plugins/typeMigration/src/intentionDescriptions/ChangeClassParametersIntention/after.java.template +++ /dev/null @@ -1,10 +0,0 @@ -public class X { - { - new Comparable<String>() { - @Override - public int compareTo(String o) { - return 0; - } - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/src/intentionDescriptions/ChangeClassParametersIntention/before.java.template b/plugins/typeMigration/src/intentionDescriptions/ChangeClassParametersIntention/before.java.template deleted file mode 100644 index 96eb1b46dbd2..000000000000 --- a/plugins/typeMigration/src/intentionDescriptions/ChangeClassParametersIntention/before.java.template +++ /dev/null @@ -1,10 +0,0 @@ -public class X { - { - new Comparable<<spam>Object</spam>>() { - @Override - public int compareTo(Object o) { - return 0; - } - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/src/intentionDescriptions/ChangeClassParametersIntention/description.html b/plugins/typeMigration/src/intentionDescriptions/ChangeClassParametersIntention/description.html deleted file mode 100644 index d4dc0a283bf8..000000000000 --- a/plugins/typeMigration/src/intentionDescriptions/ChangeClassParametersIntention/description.html +++ /dev/null @@ -1,5 +0,0 @@ -<html> -<body> -Changes anonymous class type parameters in live template. -</body> -</html>
\ No newline at end of file diff --git a/plugins/typeMigration/src/intentionDescriptions/ConvertFieldToAtomicIntention/after.java.template b/plugins/typeMigration/src/intentionDescriptions/ConvertFieldToAtomicIntention/after.java.template deleted file mode 100644 index 53cfaf5be80c..000000000000 --- a/plugins/typeMigration/src/intentionDescriptions/ConvertFieldToAtomicIntention/after.java.template +++ /dev/null @@ -1,4 +0,0 @@ -import java.util.concurrent.atomic.*; -public class X { - AtomicInteger count = new AtomicInteger(0); -} diff --git a/plugins/typeMigration/src/intentionDescriptions/ConvertFieldToAtomicIntention/before.java.template b/plugins/typeMigration/src/intentionDescriptions/ConvertFieldToAtomicIntention/before.java.template deleted file mode 100644 index 9e6048be8324..000000000000 --- a/plugins/typeMigration/src/intentionDescriptions/ConvertFieldToAtomicIntention/before.java.template +++ /dev/null @@ -1,3 +0,0 @@ -public class X { - <spot>int count = 0;</spot> -}
\ No newline at end of file diff --git a/plugins/typeMigration/src/intentionDescriptions/ConvertFieldToAtomicIntention/description.html b/plugins/typeMigration/src/intentionDescriptions/ConvertFieldToAtomicIntention/description.html deleted file mode 100644 index 0f799f7b36a8..000000000000 --- a/plugins/typeMigration/src/intentionDescriptions/ConvertFieldToAtomicIntention/description.html +++ /dev/null @@ -1,5 +0,0 @@ -<html> -<body> -This intention replaces variable type with corresponding atomic type. -</body> -</html> diff --git a/plugins/typeMigration/src/intentionDescriptions/ConvertFieldToThreadLocalIntention/after.java.template b/plugins/typeMigration/src/intentionDescriptions/ConvertFieldToThreadLocalIntention/after.java.template deleted file mode 100644 index 377017bd41c6..000000000000 --- a/plugins/typeMigration/src/intentionDescriptions/ConvertFieldToThreadLocalIntention/after.java.template +++ /dev/null @@ -1,15 +0,0 @@ -import java.text.*; -import java.util.Date; - -class X { - private static final ThreadLocal<DateFormat> dateFormat = new ThreadLocal<DateFormat>() { - @Override - protected DateFormat initialValue() { - return new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z"); - } - }; - - public String getDateString() { - return dateFormat.get().format(new Date()); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/src/intentionDescriptions/ConvertFieldToThreadLocalIntention/before.java.template b/plugins/typeMigration/src/intentionDescriptions/ConvertFieldToThreadLocalIntention/before.java.template deleted file mode 100644 index 14fae704762b..000000000000 --- a/plugins/typeMigration/src/intentionDescriptions/ConvertFieldToThreadLocalIntention/before.java.template +++ /dev/null @@ -1,10 +0,0 @@ -import java.text.*; -import java.util.Date; - -public class X { - private static DateFormat <spot>dateFormat</spot> = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z"); - - public String getDateString() { - return dateFormat.format(new Date()); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/src/intentionDescriptions/ConvertFieldToThreadLocalIntention/description.html b/plugins/typeMigration/src/intentionDescriptions/ConvertFieldToThreadLocalIntention/description.html deleted file mode 100644 index 930467e5df1b..000000000000 --- a/plugins/typeMigration/src/intentionDescriptions/ConvertFieldToThreadLocalIntention/description.html +++ /dev/null @@ -1,5 +0,0 @@ -<html> -<body> -This intention replaces field type with corresponding thread local. -</body> -</html> diff --git a/plugins/typeMigration/test/com/intellij/codeInsight/ConvertToAtomicIntentionTest.java b/plugins/typeMigration/test/com/intellij/codeInsight/ConvertToAtomicIntentionTest.java deleted file mode 100644 index 4a0b73dde767..000000000000 --- a/plugins/typeMigration/test/com/intellij/codeInsight/ConvertToAtomicIntentionTest.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.intellij.codeInsight; - -import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase; -import com.intellij.openapi.application.PluginPathManager; -import org.jetbrains.annotations.NotNull; - -/** - * @author anna - */ -public class ConvertToAtomicIntentionTest extends LightQuickFixParameterizedTestCase { - @Override - protected boolean shouldBeAvailableAfterExecution() { - return true; - } - - @Override - protected String getBasePath() { - return "/intentions/atomic"; - } - - @NotNull - @Override - protected String getTestDataPath() { - return PluginPathManager.getPluginHomePath("typeMigration") + "/testData"; - } - - public void test() throws Exception { - doAllTests(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/test/com/intellij/codeInsight/ConvertToThreadLocalIntentionTest.java b/plugins/typeMigration/test/com/intellij/codeInsight/ConvertToThreadLocalIntentionTest.java deleted file mode 100644 index 389ced7354af..000000000000 --- a/plugins/typeMigration/test/com/intellij/codeInsight/ConvertToThreadLocalIntentionTest.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.intellij.codeInsight; - -import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase; -import com.intellij.openapi.application.PluginPathManager; -import org.jetbrains.annotations.NotNull; - -/** - * @author anna - */ -public class ConvertToThreadLocalIntentionTest extends LightQuickFixParameterizedTestCase { - @Override - protected boolean shouldBeAvailableAfterExecution() { - return true; - } - - @Override - protected String getBasePath() { - return "/intentions/threadLocal"; - } - - @NotNull - @Override - protected String getTestDataPath() { - return PluginPathManager.getPluginHomePath("typeMigration") + "/testData"; - } - - public void test() throws Exception { - doAllTests(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/test/com/intellij/refactoring/AllTypeMigrationTests.java b/plugins/typeMigration/test/com/intellij/refactoring/AllTypeMigrationTests.java deleted file mode 100644 index 2fb8d9054628..000000000000 --- a/plugins/typeMigration/test/com/intellij/refactoring/AllTypeMigrationTests.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * User: anna - * Date: 04-Aug-2008 - */ -package com.intellij.refactoring; - -import com.intellij.codeInsight.ConvertToAtomicIntentionTest; -import com.intellij.codeInsight.ConvertToThreadLocalIntentionTest; -import junit.framework.Test; -import junit.framework.TestSuite; - -public class AllTypeMigrationTests { - @SuppressWarnings({"UnusedDeclaration"}) - public static Test suite() { - final TestSuite suite = new TestSuite(); - suite.addTestSuite(TypeMigrationTest.class); - suite.addTestSuite(TypeMigrationByAtomicRuleTest.class); - suite.addTestSuite(TypeMigrationByThreadLocalRuleTest.class); - suite.addTestSuite(MigrateTypeSignatureTest.class); - suite.addTestSuite(ChangeTypeSignatureTest.class); - suite.addTestSuite(WildcardTypeMigrationTest.class); - suite.addTestSuite(ConvertToAtomicIntentionTest.class); - suite.addTestSuite(ConvertToThreadLocalIntentionTest.class); - return suite; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/test/com/intellij/refactoring/ChangeTypeSignatureTest.java b/plugins/typeMigration/test/com/intellij/refactoring/ChangeTypeSignatureTest.java deleted file mode 100644 index e85b2f79fd30..000000000000 --- a/plugins/typeMigration/test/com/intellij/refactoring/ChangeTypeSignatureTest.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * User: anna - * Date: 18-Mar-2008 - */ -package com.intellij.refactoring; - -import com.intellij.openapi.application.PluginPathManager; -import com.intellij.psi.*; -import com.intellij.psi.impl.source.PsiImmediateClassType; -import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.refactoring.typeMigration.TypeMigrationLabeler; -import com.intellij.refactoring.typeMigration.TypeMigrationProcessor; -import com.intellij.refactoring.typeMigration.TypeMigrationRules; -import com.intellij.testFramework.LightCodeInsightTestCase; -import org.jetbrains.annotations.NotNull; - -public class ChangeTypeSignatureTest extends LightCodeInsightTestCase { - @NotNull - @Override - protected String getTestDataPath() { - return PluginPathManager.getPluginHomePath("typeMigration") + "/testData"; - } - - private void doTest(boolean success, String migrationTypeText) throws Exception { - String dataPath = "/refactoring/changeTypeSignature/"; - configureByFile(dataPath + getTestName(false) + ".java"); - final PsiFile file = getFile(); - final PsiElement element = file.findElementAt(getEditor().getCaretModel().getOffset()); - final PsiReferenceParameterList parameterList = PsiTreeUtil.getParentOfType(element, PsiReferenceParameterList.class); - assert parameterList != null; - final PsiClass superClass = (PsiClass)((PsiJavaCodeReferenceElement)parameterList.getParent()).resolve(); - assert superClass != null; - - PsiType migrationType = getJavaFacade().getElementFactory().createTypeFromText(migrationTypeText, null); - - try { - final TypeMigrationRules rules = new TypeMigrationRules(TypeMigrationLabeler.getElementType(parameterList)); - rules.setMigrationRootType(PsiSubstitutor.EMPTY.put(superClass.getTypeParameters()[0], migrationType).substitute(new PsiImmediateClassType(superClass, PsiSubstitutor.EMPTY))); - rules.setBoundScope(GlobalSearchScope.projectScope(getProject())); - new TypeMigrationProcessor(getProject(), parameterList, rules).run(); - if (success) { - checkResultByFile(dataPath + getTestName(false) + ".java.after"); - } else { - fail("Conflicts should be detected"); - } - } - catch (RuntimeException e) { - if (success) { - e.printStackTrace(); - fail("Conflicts should not appear"); - } - } - } - - private void doTest(boolean success) throws Exception { - doTest(success, CommonClassNames.JAVA_LANG_OBJECT); - } - - public void testListTypeArguments() throws Exception { - doTest(true); - } - - public void testFieldUsage() throws Exception { - doTest(true); - } - - public void testFieldUsage1() throws Exception { - doTest(true); - } - - public void testReturnType() throws Exception { - doTest(true); - } - - public void testReturnType1() throws Exception { - doTest(true); - } - - public void testReturnType2() throws Exception { - doTest(true); - } - - public void testPassedParameter() throws Exception { - doTest(true); - } - - public void testPassedParameter1() throws Exception { - doTest(true, "java.lang.Integer"); - } - - public void testPassedParameter2() throws Exception { - doTest(true); - } - - public void testUsedInSuper() throws Exception { - doTest(true); - } - - public void testCompositeReturnType() throws Exception { - doTest(true); - } - - public void testTypeHierarchy() throws Exception { - doTest(true); - } - - public void testTypeHierarchy1() throws Exception { - doTest(true); - } - - public void testTypeHierarchy2() throws Exception { - doTest(true); - } - - public void testTypeHierarchyFieldUsage() throws Exception { - doTest(true); - } - - public void testTypeHierarchyFieldUsageConflict() throws Exception { - doTest(true); - } - - public void testParameterMigration() throws Exception { - doTest(true); - } - - public void testParameterMigration1() throws Exception { - doTest(true, "java.lang.Integer"); - } - - public void testParameterMigration2() throws Exception { - doTest(true, "java.lang.Integer"); - } - - public void testFieldTypeMigration() throws Exception { - doTest(true, "java.lang.String"); - } - - public void testMethodReturnTypeMigration() throws Exception { - doTest(true, "java.lang.Integer"); - } - - @Override - protected boolean isRunInWriteAction() { - return false; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/test/com/intellij/refactoring/MigrateTypeSignatureTest.java b/plugins/typeMigration/test/com/intellij/refactoring/MigrateTypeSignatureTest.java deleted file mode 100644 index 7889306ed6f0..000000000000 --- a/plugins/typeMigration/test/com/intellij/refactoring/MigrateTypeSignatureTest.java +++ /dev/null @@ -1,561 +0,0 @@ -/* - * User: anna - * Date: 30-Apr-2008 - */ -package com.intellij.refactoring; - -import com.intellij.psi.CommonClassNames; -import com.intellij.psi.PsiEllipsisType; -import com.intellij.psi.PsiType; -import org.jetbrains.annotations.NotNull; - -public class MigrateTypeSignatureTest extends TypeMigrationTestBase { - @NotNull - @Override - public String getTestRoot() { - return "/refactoring/migrateTypeSignature/"; - } - - public void testExprAccess2Lvalue() throws Exception { - doTestFieldType("myForAccess", "Expr", - myJavaFacade.getElementFactory().createTypeFromText("ClassChild", null), - myJavaFacade.getElementFactory().createTypeFromText("ClassParent", null)); - } - - public void testExprAccess2Rvalue() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText("ClassChild", null), - myJavaFacade.getElementFactory().createTypeFromText("ClassGrandChild", null)); - } - - public void testExprAccessParent2Lvalue() throws Exception { - doTestFieldType("myForSuperAccess", "Ession", - myJavaFacade.getElementFactory().createTypeFromText("ClassChild", null), - myJavaFacade.getElementFactory().createTypeFromText("ClassParent", null)); - } - - public void testExprAccessParent2Rvalue() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText("ClassChild", null), - myJavaFacade.getElementFactory().createTypeFromText("ClassGrandChild", null)); - } - - public void testExprArrayAccessNegative() throws Exception { - doTestFirstParamType("meth", "Expr", PsiType.INT, PsiType.DOUBLE); - } - - public void testExprArrayAccessPositive() throws Exception { - doTestFirstParamType("meth", "Expr", PsiType.INT, PsiType.CHAR); - } - - public void testExprCalcBooleanBoolean() throws Exception { - doTestFirstParamType("meth", "Expr", PsiType.BOOLEAN, PsiType.INT); - } - - public void testExprCalcBooleanNumeric() throws Exception { - doTestFirstParamType("meth", "Expr", PsiType.INT, - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null)); - } - - public void testExprCalcBooleanReference() throws Exception { - doTestFirstParamType("meth", "Expr", - myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null), - PsiType.DOUBLE); - } - - public void testExprCalcNumeric2Boolean() throws Exception { - doTestFirstParamType("meth", "Expr", PsiType.INT, PsiType.BOOLEAN); - } - - public void testExprCalcNumeric2Floating() throws Exception { - doTestFirstParamType("meth", "Expr", PsiType.INT, PsiType.FLOAT); - } - - public void testExprCalcNumeric2Int() throws Exception { - doTestFirstParamType("meth", "Expr", PsiType.INT, PsiType.LONG); - } - - public void testExprCalcNumeric2String() throws Exception { - doTestFirstParamType("meth", "Expr", PsiType.INT, - myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null)); - } - - public void testExprCast2LvalueNeg() throws Exception { - doTestFirstParamType("meth", "Expr", PsiType.BYTE, - myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null)); - } - - public void testExprCast2LvaluePos() throws Exception { - doTestFirstParamType("meth", "Expr", PsiType.BYTE, PsiType.INT); - } - - public void testExprConcatNumeric2Reference() throws Exception { - doTestFirstParamType("meth", "Expr", PsiType.INT, - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null)); - } - - public void testExprConcatNumeric2String() throws Exception { - doTestFirstParamType("meth", "Expr", PsiType.INT, - myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null)); - } - - public void testExprConcatString2Numeric() throws Exception { - doTestFirstParamType("meth", "Expr", - myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null), - PsiType.INT); - } - - public void testExprConcatString2Reference() throws Exception { - doTestFirstParamType("meth", "Expr", - myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null), - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null)); - } - - public void testExprInstanceofNeg() throws Exception { - doTestFirstParamType("meth", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_UTIL_SET, null), - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_UTIL_LIST, null)); - } - - public void testExprInstanceofPos() throws Exception { - doTestFirstParamType("meth", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_UTIL_MAP, null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.AbstractMap", null)); - } - - public void testExprLiteralBoolean() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - PsiType.BOOLEAN); - } - - public void testExprLiteralByte() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - PsiType.BYTE); - } - - public void testExprLiteralChar() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - PsiType.CHAR); - } - - public void testExprLiteralClassExtends() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Class<? extends java.util.Collection[]>", null)); - } - - public void testExprLiteralClassPrimitive() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Class<Integer>", null)); - } - - public void testExprLiteralClassPrimitiveArray() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Class<int[]>", null)); - } - - public void testExprLiteralClassRaw() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Class", null)); - } - - public void testExprLiteralClassReference() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Class<java.util.Set>", null)); - } - - public void testExprLiteralClassReferenceArray() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Class<java.util.Set[]>", null)); - } - - public void testExprLiteralClassSuper() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Class<? super java.util.AbstractSet[]>", null)); - } - - public void testExprLiteralDouble() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - PsiType.DOUBLE); - } - - public void testExprLiteralFloat() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - PsiType.FLOAT); - } - - public void testExprLiteralInt() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - PsiType.INT); - } - - public void testExprLiteralLong() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - PsiType.LONG); - } - - public void testExprLiteralShort() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - PsiType.SHORT); - } - - public void testExprLiteralString() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null)); - } - - public void testExprNewArrayArray2Lvalue() throws Exception { - doTestFirstParamType("meth", "Expr", - myJavaFacade.getElementFactory().createTypeFromText("FaceChild", null).createArrayType(), - myJavaFacade.getElementFactory().createTypeFromText("FaceParent", null).createArrayType()); - } - - public void testExprNewArrayArray2Rvalue() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText("FaceChild", null).createArrayType().createArrayType().createArrayType(), - myJavaFacade.getElementFactory().createTypeFromText("ClassParent", null).createArrayType().createArrayType().createArrayType()); - } - - public void testExprNewArrayGen2Rvalue() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_UTIL_SET, null).createArrayType(), - myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<java.lang.Integer>", null).createArrayType()); - } - - public void testExprNewArrayPrimitive2Lvalue() throws Exception { - doTestFirstParamType("meth", "Expr", PsiType.BOOLEAN, PsiType.INT); - } - - public void testExprNewArrayPrimitive2Rvalue() throws Exception { - doTestFieldType("myField", "Expr", - PsiType.BOOLEAN.createArrayType().createArrayType(), - PsiType.INT.createArrayType().createArrayType()); - } - - public void testExprNewArrayReftype2Lvalue() throws Exception { - doTestFirstParamType("meth", "Expr", - myJavaFacade.getElementFactory().createTypeFromText("FaceChild", null), - myJavaFacade.getElementFactory().createTypeFromText("FaceParent", null)); - } - - public void testExprNewArrayReftype2Rvalue() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText("FaceChild", null).createArrayType().createArrayType(), - myJavaFacade.getElementFactory().createTypeFromText("ClassParent", null).createArrayType().createArrayType()); - } - - public void testExprNewGen() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<Subject>", null)); - } - - public void testExprNewGenExtends() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<? extends Subject>", null)); - } - - public void testExprNewGenSuper() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<? super Subject>", null)); - } - - public void testExprNewReference() throws Exception { - doTestFieldType("myField", "Expr", - myJavaFacade.getElementFactory().createTypeFromText("Expr.Ancestor", null), - myJavaFacade.getElementFactory().createTypeFromText("Expr.Subject", null)); - } - - public void testExprReturn2Lvalue() throws Exception { - doTestFirstParamType("meth", "Expr", PsiType.INT, - myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null)); - } - - public void testExprReturn2Rvalue() throws Exception { - doTestMethodType("meth", "Expr", PsiType.INT, - myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null)); - } - - public void testExprTernary() throws Exception { - doTestFirstParamType("meth", "Expr", PsiType.DOUBLE, - myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null)); - } - - public void testOverridingDown() throws Exception { - doTestMethodType("getInt", "Parent", PsiType.INT, PsiType.BYTE); - } - - public void testOverridingUp() throws Exception { - doTestMethodType("getInt", "Child", PsiType.INT, PsiType.BYTE); - } - - public void testSpecJavadoc() throws Exception { - doTestFirstParamType("meth", "Spec", PsiType.DOUBLE, - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_UTIL_SET, null)); - } - - public void testSpecNotUsed() throws Exception { - doTestFieldType("myField", "Spec", PsiType.INT, PsiType.BOOLEAN); - } - - public void testTypeArrayReftype2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", - myJavaFacade.getElementFactory().createTypeFromText("Descendant", null).createArrayType(), - myJavaFacade.getElementFactory().createTypeFromText("Subject", null).createArrayType()); - } - - public void testTypeArrayReftype2Rvalue() throws Exception { - doTestFieldType("myField", "Type", - myJavaFacade.getElementFactory().createTypeFromText("Ancestor", null).createArrayType().createArrayType(), - myJavaFacade.getElementFactory().createTypeFromText("Subject", null).createArrayType().createArrayType()); - } - - public void testTypeArrayRoots2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", - myJavaFacade.getElementFactory().createTypeFromText("Holder", null), - myJavaFacade.getElementFactory().createTypeFromText("Holder", null).createArrayType()); - } - - public void testTypeArrayVararg2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", - myJavaFacade.getElementFactory().createTypeFromText("Descendant", null).createArrayType(), - new PsiEllipsisType(myJavaFacade.getElementFactory().createTypeFromText("Subject", null))); - } - - public void testTypeArrayVararg2RvalueNeg() throws Exception { - doTestFieldType("myField", "Type", - myJavaFacade.getElementFactory().createTypeFromText("Ancestor", null).createArrayType(), - myJavaFacade.getElementFactory().createTypeFromText("Descendant", null).createArrayType()); - } - - public void testTypeArrayVararg2RvaluePos() throws Exception { - doTestFieldType("myField", "Type", - myJavaFacade.getElementFactory().createTypeFromText("Ancestor", null).createArrayType(), - myJavaFacade.getElementFactory().createTypeFromText("Subject", null).createArrayType()); - } - - public void testTypeAutoboxBoolean2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", PsiType.BOOLEAN, - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Boolean", null)); - } - - public void testTypeAutoboxBoolean2Rvalue() throws Exception { - doTestFieldType("myField", "Type", myJavaFacade.getElementFactory().createTypeFromText("java.lang.Boolean", null), - PsiType.BOOLEAN); - } - - public void testTypeAutoboxByte2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", PsiType.BYTE, - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Byte", null)); - } - - public void testTypeAutoboxByte2Rvalue() throws Exception { - doTestFieldType("myField", "Type", myJavaFacade.getElementFactory().createTypeFromText("java.lang.Byte", null), - PsiType.BYTE); - } - - public void testTypeAutoboxChar2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", PsiType.CHAR, - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Character", null)); - } - - public void testTypeAutoboxChar2Rvalue() throws Exception { - doTestFieldType("myField", "Type", myJavaFacade.getElementFactory().createTypeFromText("java.lang.Character", null), - PsiType.CHAR); - } - - public void testTypeAutoboxDouble2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", PsiType.DOUBLE, - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Double", null)); - } - - public void testTypeAutoboxDouble2Rvalue() throws Exception { - doTestFieldType("myField", "Type", myJavaFacade.getElementFactory().createTypeFromText("java.lang.Double", null), - PsiType.DOUBLE); - } - - public void testTypeAutoboxFloat2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", PsiType.FLOAT, - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Float", null)); - } - - public void testTypeAutoboxFloat2Rvalue() throws Exception { - doTestFieldType("myField", "Type", myJavaFacade.getElementFactory().createTypeFromText("java.lang.Float", null), - PsiType.FLOAT); - } - - public void testTypeAutoboxInt2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", PsiType.INT, - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Integer", null)); - } - - public void testTypeAutoboxInt2Rvalue() throws Exception { - doTestFieldType("myField", "Type", myJavaFacade.getElementFactory().createTypeFromText("java.lang.Integer", null), - PsiType.INT); - } - - public void testTypeAutoboxLong2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", PsiType.LONG, - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Long", null)); - } - - public void testTypeAutoboxLong2Rvalue() throws Exception { - doTestFieldType("myField", "Type", myJavaFacade.getElementFactory().createTypeFromText("java.lang.Long", null), - PsiType.LONG); - } - - public void testTypeAutoboxShort2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", PsiType.SHORT, - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Short", null)); - } - - public void testTypeAutoboxShort2Rvalue() throws Exception { - doTestFieldType("myField", "Type", myJavaFacade.getElementFactory().createTypeFromText("java.lang.Short", null), - PsiType.SHORT); - } - - public void testTypeGenAncestor2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_UTIL_SET, null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<Subject>", null)); - } - - public void testTypeGenAncestorWildcard2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_UTIL_SET, null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<? extends Subject>", null)); - } - - public void testTypeGenDescendant2Rvalue() throws Exception { - doTestFieldType("myField", "Type", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_UTIL_SET, null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<Subject>", null)); - } - - public void testTypeGenDescendantWildcard2Rvalue() throws Exception { - doTestFieldType("myField", "Type", - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_UTIL_SET, null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<? super Subject>", null)); - } - - public void testTypeGenRaw2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", - myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<Any>", null), - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_UTIL_SET, null)); - } - - public void testTypeGenRaw2Rvalue() throws Exception { - doTestFieldType("myField", "Type", - myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<Any>", null), - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_UTIL_SET, null)); - } - - public void testTypePrimsubBoolean2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", PsiType.INT, PsiType.BOOLEAN); - } - - public void testTypePrimsubBoolean2Rvalue() throws Exception { - doTestFieldType("myField", "Type", PsiType.INT, PsiType.BOOLEAN); - } - - public void testTypePrimsubByte2Rvalue() throws Exception { - doTestFieldType("myField", "Type", PsiType.DOUBLE, PsiType.BYTE); - } - - public void testTypePrimsubChar2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", PsiType.BYTE, PsiType.CHAR); - } - - public void testTypePrimsubChar2Rvalue() throws Exception { - doTestFieldType("myField", "Type", PsiType.DOUBLE, PsiType.CHAR); - } - - public void testTypePrimsubDouble2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", PsiType.BYTE, PsiType.DOUBLE); - } - - public void testTypePrimsubFloat2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", PsiType.BYTE, PsiType.FLOAT); - } - - public void testTypePrimsubFloat2Rvalue() throws Exception { - doTestFieldType("myField", "Type", PsiType.DOUBLE, PsiType.FLOAT); - } - - public void testTypePrimsubInt2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", PsiType.BYTE, PsiType.INT); - } - - public void testTypePrimsubInt2Rvalue() throws Exception { - doTestFieldType("myField", "Type", PsiType.DOUBLE, PsiType.INT); - } - - public void testTypePrimsubLong2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", PsiType.BYTE, PsiType.LONG); - } - - public void testTypePrimsubLong2Rvalue() throws Exception { - doTestFieldType("myField", "Type", PsiType.DOUBLE, PsiType.LONG); - } - - public void testTypePrimsubShort2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", PsiType.BYTE, PsiType.SHORT); - } - - public void testTypePrimsubShort2Rvalue() throws Exception { - doTestFieldType("myField", "Type", PsiType.DOUBLE, PsiType.SHORT); - } - - public void testTypeRefClassChild2Rvalue() throws Exception { - doTestFieldType("myField", "Type", - myJavaFacade.getElementFactory().createTypeFromText("FaceParent", null), - myJavaFacade.getElementFactory().createTypeFromText("ClassChild", null)); - } - - public void testTypeRefClassParent2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", - myJavaFacade.getElementFactory().createTypeFromText("ClassChild", null), - myJavaFacade.getElementFactory().createTypeFromText("ClassParent", null)); - } - - public void testTypeRefClassParent2Rvalue() throws Exception { - doTestFieldType("myField", "Type", - myJavaFacade.getElementFactory().createTypeFromText("FaceParent", null), - myJavaFacade.getElementFactory().createTypeFromText("ClassParent", null)); - } - - public void testTypeRefFaceChild2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", - myJavaFacade.getElementFactory().createTypeFromText("ClassChild", null), - myJavaFacade.getElementFactory().createTypeFromText("FaceChild", null)); - } - - public void testTypeRefFaceChild2Rvalue() throws Exception { - doTestFieldType("myField", "Type", - myJavaFacade.getElementFactory().createTypeFromText("FaceParent", null), - myJavaFacade.getElementFactory().createTypeFromText("FaceChild", null)); - } - - public void testTypeRefFaceParent2Lvalue() throws Exception { - doTestFirstParamType("meth", "Type", - myJavaFacade.getElementFactory().createTypeFromText("ClassChild", null), - myJavaFacade.getElementFactory().createTypeFromText("FaceParent", null)); - } -} diff --git a/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationByAtomicRuleTest.java b/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationByAtomicRuleTest.java deleted file mode 100644 index 80658077e986..000000000000 --- a/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationByAtomicRuleTest.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * User: anna - * Date: 19-Aug-2009 - */ -package com.intellij.refactoring; - -import com.intellij.psi.PsiType; -import org.jetbrains.annotations.NotNull; - -import java.util.concurrent.atomic.AtomicReferenceArray; -import java.util.concurrent.atomic.AtomicIntegerArray; - -public class TypeMigrationByAtomicRuleTest extends TypeMigrationTestBase{ - @NotNull - @Override - protected String getTestRoot() { - return "/refactoring/typeMigrationByAtomic/"; - } - - private void doTestDirectMigration() throws Exception { - doTestFieldType("i", PsiType.INT, myJavaFacade.getElementFactory().createTypeFromText("java.util.concurrent.atomic.AtomicInteger", null)); - } - - - public void testDirectIncrementDecrement() throws Exception { - doTestDirectMigration(); - } - - public void testDirectAssignments() throws Exception { - doTestDirectMigration(); - } - - public void testDirectConditions() throws Exception { - doTestFieldType("b", PsiType.BOOLEAN, myJavaFacade.getElementFactory().createTypeFromText("java.util.concurrent.atomic.AtomicBoolean", null)); - } - - - public void testDirectByte() throws Exception { - doTestFieldType("b", PsiType.BYTE, myJavaFacade.getElementFactory().createTypeFromText("java.util.concurrent.atomic.AtomicReference<java.lang.Byte>", null)); - } - - public void testDirectString() throws Exception { - doTestFieldType("s", myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.concurrent.atomic.AtomicReference<java.lang.String>", null)); - } - - public void testDirectForeach() throws Exception { - doTestFieldType("lst", myJavaFacade.getElementFactory().createTypeFromText("java.util.List<java.lang.String>", null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.concurrent.atomic.AtomicReference<java.util.List<java.lang.String>>", null)); - } - - public void testDirectStringArray() throws Exception { - doTestFieldType("s", myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null).createArrayType(), - myJavaFacade.getElementFactory().createTypeFromText(AtomicReferenceArray.class.getName() + "<java.lang.String>", null)); - } - - public void testDirectIntArray() throws Exception { - doTestFieldType("a", PsiType.INT.createArrayType(), - myJavaFacade.getElementFactory().createTypeFromText(AtomicIntegerArray.class.getName(), null)); - } - - private void doTestReverseMigration() throws Exception { - doTestFieldType("i", myJavaFacade.getElementFactory().createTypeFromText("java.util.concurrent.atomic.AtomicInteger", null), PsiType.INT); - } - - - public void testReverseIncrementDecrement() throws Exception { - doTestReverseMigration(); - } - - public void testReverseAssignments() throws Exception { - doTestReverseMigration(); - } - - public void testReverseConditions() throws Exception { - doTestFieldType("b", myJavaFacade.getElementFactory().createTypeFromText("java.util.concurrent.atomic.AtomicBoolean", null), PsiType.BOOLEAN); - } - - public void testReverseByte() throws Exception { - doTestFieldType("b", myJavaFacade.getElementFactory().createTypeFromText("java.util.concurrent.atomic.AtomicReference<java.lang.Byte>", null), PsiType.BYTE); - } - - public void testReverseString() throws Exception { - doTestFieldType("s", - myJavaFacade.getElementFactory().createTypeFromText("java.util.concurrent.atomic.AtomicReference<java.lang.String>", null), - myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null)); - } - - public void testReverseStringArray() throws Exception { - doTestFieldType("s", - myJavaFacade.getElementFactory().createTypeFromText("java.util.concurrent.atomic.AtomicReferenceArray<java.lang.String>", null), - myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null).createArrayType()); - } - - public void testReverseIntArray() throws Exception { - doTestFieldType("a", - myJavaFacade.getElementFactory().createTypeFromText("java.util.concurrent.atomic.AtomicIntegerArray", null), - PsiType.INT.createArrayType()); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationByThreadLocalRuleTest.java b/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationByThreadLocalRuleTest.java deleted file mode 100644 index 5d002d3fcced..000000000000 --- a/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationByThreadLocalRuleTest.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * User: anna - * Date: 19-Aug-2009 - */ -package com.intellij.refactoring; - -import com.intellij.psi.PsiType; -import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.openapi.roots.LanguageLevelProjectExtension; -import com.intellij.pom.java.LanguageLevel; -import org.jetbrains.annotations.NotNull; - -public class TypeMigrationByThreadLocalRuleTest extends TypeMigrationTestBase{ - @NotNull - @Override - protected String getTestRoot() { - return "/refactoring/typeMigrationByThreadLocal/"; - } - - - public void testDirectInt() throws Exception { - doTestFieldType("i", PsiType.INT, myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal<java.lang.Integer>", null)); - } - - public void testDirectByte() throws Exception { - doTestFieldType("i", PsiType.BYTE, myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal<java.lang.Byte>", null)); - } - - public void testDirectString() throws Exception { - doTestFieldType("myS", PsiType.getJavaLangString(myPsiManager, GlobalSearchScope.allScope(myProject)), myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal<java.lang.String>", null)); - } - - public void testLanguageLevel() throws Exception { - final LanguageLevelProjectExtension extension = LanguageLevelProjectExtension.getInstance(getProject()); - final LanguageLevel languageLevel = extension.getLanguageLevel(); - try { - extension.setLanguageLevel(LanguageLevel.JDK_1_3); - doTestFieldType("i", PsiType.INT, myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal", null)); - } - finally { - extension.setLanguageLevel(languageLevel); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java b/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java deleted file mode 100644 index b3c36dca19f2..000000000000 --- a/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java +++ /dev/null @@ -1,883 +0,0 @@ -package com.intellij.refactoring; - -import com.intellij.openapi.roots.LanguageLevelProjectExtension; -import com.intellij.pom.java.LanguageLevel; -import com.intellij.psi.*; -import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.refactoring.typeMigration.TypeMigrationRules; -import org.jetbrains.annotations.NotNull; - -/** - * @author db - * @since 22.07.2003 - */ -public class TypeMigrationTest extends TypeMigrationTestBase { - private PsiElementFactory myFactory; - - @NotNull - @Override - public String getTestRoot() { - return "/refactoring/typeMigration/"; - } - - @Override - public void setUp() throws Exception { - super.setUp(); - LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.HIGHEST); - myFactory = myJavaFacade.getElementFactory(); - } - - public void testT07() { - doTestFieldType("f", - PsiType.INT.createArrayType(), - myFactory.createTypeFromText("java.lang.Integer", null).createArrayType()); - } - - public void testT08() { - doTestFieldType("f", - myFactory.createTypeFromText("java.lang.Integer", null).createArrayType(), - myFactory.createTypeFromText("java.lang.String", null).createArrayType()); - } - - public void testT09() { - doTestFieldType("f", - myFactory.createTypeFromText("java.lang.Integer", null).createArrayType(), - myFactory.createTypeFromText("java.lang.String", null).createArrayType()); - } - - public void testT10() { - doTestFieldType("f", - myFactory.createTypeFromText("java.util.List<java.lang.Integer>", null), - myFactory.createTypeFromText("java.util.List<java.lang.String>", null)); - } - - public void testT11() { - doTestFieldType("f", - myFactory.createTypeFromText("java.util.Map<java.lang.Integer, java.lang.Integer>", null), - myFactory.createTypeFromText("java.util.Map<java.lang.String, java.lang.Integer>", null)); - } - - public void testT12() { - doTestFieldType("f", - myFactory.createTypeFromText("java.util.List<java.lang.Integer>", null), - myFactory.createTypeFromText("java.util.List<java.lang.String>", null)); - } - - public void testT13() { - doTestFieldType("f", - myFactory.createTypeFromText("java.util.List<java.lang.String>", null), - myFactory.createTypeFromText("java.util.List<java.lang.Integer>", null)); - } - - public void testT14() { - doTestFieldType("f", - myFactory.createTypeFromText("B", null), - myFactory.createTypeFromText("A", null)); - } - - //do not touch javadoc refs etc - public void testT15() { - doTestFieldType("f", - myFactory.createTypeFromText("B", null), - myFactory.createTypeFromText("A", null)); - } - - //do not touch signature with method type parameters - public void testT16() { - doTestFieldType("f", - myFactory.createTypeFromText("A", null), - myFactory.createTypeFromText("B", null)); - } - - //change method signature inspired by call on parameters - public void testT17() { - doTestFieldType("f", - myFactory.createTypeFromText("A", null), - myFactory.createTypeFromText("B", null)); - } - - //extending iterable -> used in foreach statement - public void testT18() { - doTestFieldType("f", - myFactory.createTypeFromText("A", null), - myFactory.createTypeFromText("B", null)); - } - - public void testT19() { - doTestFieldType("f", - myFactory.createTypeFromText("java.util.Map<java.lang.String, java.lang.String>", null), - myFactory.createTypeFromText("java.util.HashMap<java.lang.Integer, java.lang.Integer>", null)); - } - - public void testT20() { - doTestFieldType("f", - myFactory.createTypeFromText("java.util.HashMap<java.lang.Integer, java.lang.Integer>", null), - myFactory.createTypeFromText("java.util.Map<java.lang.String, java.lang.String>", null)); - } - - public void testT21() { - doTestFieldType("f", - myFactory.createTypeFromText("java.util.Map<java.lang.String, java.util.List<java.lang.String>>", - null), - myFactory.createTypeFromText("java.util.Map<java.lang.String, java.util.Set<java.lang.String>>", - null) - ); - } - - //varargs : removed after migration?! - public void testT22() { - doTestFieldType("f", - myFactory.createTypeFromText("java.lang.String", null), - myFactory.createTypeFromText("java.lang.Integer", null)); - } - - //substitution from super class: type params substitution needed - public void testT23() { - doTestFieldType("f", - myFactory.createTypeFromText("HashMap<java.lang.String, java.util.Set<java.lang.String>>", null), - myFactory.createTypeFromText("HashMap<java.lang.String, java.util.List<java.lang.String>>", null)); - } - - //check return type unchanged when it is possible - public void testT24() { - doTestFieldType("f", - myFactory.createTypeFromText("C", null), - myFactory.createTypeFromText("D", null)); - } - - public void testT25() { - doTestFieldType("f", - myFactory.createTypeFromText("C", null), - myFactory.createTypeFromText("D", null)); - } - - //check param type change - public void testT26() { - doTestFieldType("f", - myFactory.createTypeFromText("C", null), - myFactory.createTypeFromText("D", null)); - } - - public void testT27() { - doTestFieldType("f", - myFactory.createTypeFromText("C", null), - myFactory.createTypeFromText("D", null)); - } - - //list --> array - public void testT28() { - doTestFieldType("f", - myFactory.createTypeFromText("java.util.List<java.lang.String>", null), - myFactory.createTypeFromText("java.lang.String", null).createArrayType()); - } - - public void testT29() { - doTestMethodType("get", - myFactory.createTypeFromText("java.lang.String", null).createArrayType(), - myFactory.createTypeFromText("java.util.List<java.lang.String>", null)); - } - - public void testT30() { - doTestFieldType("f", - myFactory.createTypeFromText("java.util.List<java.lang.String>", null), - myFactory.createTypeFromText("java.lang.String", null).createArrayType()); - } - - - public void testT31() { - doTestFieldType("f", - myFactory.createTypeFromText("Test", null), - myFactory.createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null)); - } - - //non code usages - public void testT32() { - doTestFirstParamType("bar", - myFactory.createTypeFromText("long", null), - myFactory.createTypeFromText("int", null)); - } - - //change type arguments for new expressions: l = new ArrayList<String>() -> l = new ArrayList<Integer>() - public void testT33() { - doTestFieldType("l", - myFactory.createTypeFromText("java.util.List<java.lang.String>", null), - myFactory.createTypeFromText("java.util.List<java.lang.Integer>", null)); - } - - //new expression new ArrayList<String>() should be left without modifications - public void testT34() { - doTestFieldType("l", - myFactory.createTypeFromText("java.util.List<java.lang.String>", null), - myFactory.createTypeFromText("java.util.AbstractList<java.lang.String>", null)); - } - - public void testT35() { - doTestFieldType("myParent", - myFactory.createTypeFromText("Test", null), - myFactory.createTypeFromText("TestImpl", null)); - } - - //co-variant/contra-variant positions for primitive types 36-39 - public void testT36() { - doTestFirstParamType("foo", PsiType.INT, PsiType.BYTE); - } - - public void testT37() { - doTestFirstParamType("foo", PsiType.SHORT, PsiType.INT); - } - - public void testT38() { - doTestFirstParamType("foo", PsiType.SHORT, PsiType.LONG); - } - - public void testT39() { - doTestFirstParamType("foo", PsiType.SHORT, PsiType.BYTE); - } - - //Set s = new HashSet() -> HashSet s = new HashSet(); - public void testT40() { - doTestFieldType("l", - myFactory.createTypeFromText(CommonClassNames.JAVA_UTIL_LIST, null), - myFactory.createTypeFromText("java.util.ArrayList", null)); - } - - //Set s = new HashSet<String>() -> HashSet s = new HashSet<String>(); - public void testT41() { - doTestFieldType("l", - myFactory.createTypeFromText(CommonClassNames.JAVA_UTIL_LIST, null), - myFactory.createTypeFromText("java.util.ArrayList", null)); - } - - //Set s = new HashSet() -> HashSet<String> s = new HashSet(); - public void testT42() { - doTestFieldType("l", - myFactory.createTypeFromText(CommonClassNames.JAVA_UTIL_LIST, null), - myFactory.createTypeFromText("java.util.ArrayList<java.lang.String>", null)); - } - - //long l; Object o = l -> long l; Long o = l; - public void testT43() { - doTestFieldType("o", - myFactory.createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - myFactory.createTypeFromText("java.lang.Long", null)); - } - - //long l; int i; l = i; -> long l; byte i; l = i; - public void testT44() { - doTestFieldType("i", PsiType.INT, PsiType.BYTE); - } - - //long l; int i; l = i; -> byte l; -> byte i; l = i; - public void testT45() { - doTestFieldType("l", PsiType.LONG, PsiType.BYTE); - } - - //byte i; long j = i; -> byte i; int j = i; - public void testT46() { - doTestFieldType("j", PsiType.LONG, PsiType.INT); - } - - //o = null -? int o = null - public void testT47() { - doTestFieldType("o", myFactory.createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), PsiType.INT); - } - - //co-variant/contra-variant assignments: leave types if possible change generics signature only 48-49 - // foo(AbstractSet<String> s){Set<String> ss = s} -> foo(AbstractSet<Integer> s){Set<Integer> ss = s} - public void testT48() { - doTestFirstParamType("foo", - myFactory.createTypeFromText("java.util.AbstractSet<A>", null), - myFactory.createTypeFromText("java.util.AbstractSet<B>", null)); - } - - // Set<String> f; foo(AbstractSet<String> s){f = s} -> Set<Integer>f; foo(AbstractSet<Integer> s){f = s} - public void testT49() { - doTestFieldType("f", - myFactory.createTypeFromText("java.util.Set<A>", null), - myFactory.createTypeFromText("java.util.Set<B>", null)); - } - - //captured wildcard: Set<? extends JComponent> s; Set<? extends JComponent> c1 = s; -> - // Set<? extends JButton> s; Set<? extends JButton> c1 = s; - public void testT50() { - doTestFieldType("c1", - myFactory.createTypeFromText("java.util.Set<? extends JComponent>", null), - myFactory.createTypeFromText("java.util.Set<? extends JButton>", null)); - } - - //array initialization: 51-52 - public void testT51() { - doTestFieldType("f", - myFactory.createTypeFromText("java.lang.String", null).createArrayType(), - myFactory.createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null).createArrayType()); - } - - public void testT52() { - doTestFieldType("f", - myFactory.createTypeFromText(CommonClassNames.JAVA_UTIL_SET, null).createArrayType(), - myFactory.createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null).createArrayType()); - } - - //generic type promotion to array initializer - public void testT53() { - doTestFieldType("f", - PsiType.DOUBLE.createArrayType(), - myFactory.createTypeFromText("java.util.Set<java.lang.String>", null).createArrayType()); - } - - //wildcard type promotion to expressions 54-55 - public void testT54() { - doTestFieldType("f", - myFactory.createTypeFromText("java.util.Set<java.lang.Object>", null), - myFactory.createTypeFromText("java.util.Set<? extends java.lang.Integer>", null)); - } - - public void testT55() { - doTestFieldType("f", - myFactory.createTypeFromText("java.util.Set<java.lang.Object>", null), - myFactory.createTypeFromText("java.util.Set<?>", null)); - } - - //array index should be integer 56-57 - public void testT56() { - doTestFirstParamType("foo", PsiType.INT, PsiType.DOUBLE); - } - - public void testT57() { - doTestFirstParamType("foo", PsiType.INT, PsiType.BYTE); - } - - //Arrays can be assignable to Object/Serializable/Cloneable 58-59; ~ 60 varargs - public void testT58() { - doTestFieldType("f", - myFactory.createTypeFromText("java.lang.String", null).createArrayType(), - myFactory.createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null)); - } - - public void testT59() { - doTestFieldType("f", - myFactory.createTypeFromText("java.lang.String", null).createArrayType(), - myFactory.createTypeFromText("java.lang.Cloneable", null)); - } - - public void testT60() { - doTestFieldType("p", - PsiType.INT.createArrayType(), - myFactory.createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null)); - } - - //change parameter type -> vararg; assignment changed to array - public void testT61() { - doTestFirstParamType("foo", PsiType.INT, new PsiEllipsisType(PsiType.INT)); - } - - //change field type -> change vararg parameter type due to assignment: 62-63 - public void testT62() { - doTestFieldType("p", PsiType.INT.createArrayType(), myFactory.createTypeFromText( - CommonClassNames.JAVA_LANG_OBJECT, null)); - } - - public void testT63() { - doTestFieldType("p", PsiType.INT.createArrayType(), PsiType.DOUBLE.createArrayType()); - } - - //remove vararg type: 64-66 - public void testT64() { - doTestFirstParamType("foo", new PsiEllipsisType(PsiType.INT), PsiType.INT); - } - - public void testT65() { - doTestFirstParamType("foo", - new PsiEllipsisType(PsiType.INT), - myFactory.createTypeFromText("java.lang.String", null)); - } - - public void testT115() { - doTestFirstParamType("foo", - new PsiEllipsisType(myFactory.createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null)), - new PsiEllipsisType(myFactory.createTypeFromText("java.lang.String", null))); - } - - public void testT66() { - doTestFirstParamType("foo", new PsiEllipsisType(PsiType.INT), PsiType.INT); - } - - public void testT67() { - doTestFirstParamType("methMemAcc", - myFactory.createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - myFactory.createTypeFromText("java.lang.String", null)); - } - - public void testT68() { - doTestFirstParamType("foo", PsiType.INT, PsiType.DOUBLE); - } - - public void testT69() { - doTestFirstParamType("foo", PsiType.INT, PsiType.BYTE); - } - - public void testT70() { - doTestFieldType("a", PsiType.INT.createArrayType().createArrayType(), PsiType.FLOAT.createArrayType().createArrayType()); - } - - public void testT71() { - doTestFieldType("f", - myFactory.createTypeFromText(CommonClassNames.JAVA_LANG_CLASS, null), - myFactory.createTypeFromText("java.lang.Class<? extends java.lang.Number>", null)); - } - - public void testT72() { - doTestFieldType("f", - myFactory.createTypeFromText(CommonClassNames.JAVA_LANG_CLASS, null), - myFactory.createTypeFromText("java.lang.Class<java.lang.Integer>", null)); - } - - public void testT73() { - doTestFieldType("f", - myFactory.createTypeFromText("java.util.Set<javax.swing.JComponent>", null).createArrayType().createArrayType(), - myFactory.createTypeFromText("java.util.Set<java.awt.Component>", null).createArrayType().createArrayType()); - } - - //prefix/postfix expression; binary expressions 74-76 - public void testT74() { - doTestFirstParamType("meth", PsiType.INT, PsiType.FLOAT); - } - - public void testT75() { - doTestFirstParamType("meth", PsiType.INT, myFactory.createTypeFromText("java.lang.String", null)); - } - - public void testT76() { - doTestFirstParamType("meth", PsiType.BYTE, PsiType.FLOAT); - } - - //+= , etc 77-78 - public void testT77() { - doTestFirstParamType("meth", PsiType.INT, myFactory.createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null)); - } - - public void testT78() { - doTestFirstParamType("meth", PsiType.INT, myFactory.createTypeFromText("java.lang.String", null)); - } - - //casts 79-80,83 - public void testT79() { - doTestFirstParamType("meth", PsiType.INT, PsiType.BYTE); - } - - public void testT80() { - doTestFirstParamType("meth", PsiType.INT, PsiType.DOUBLE); - } - - public void testT83() { - doTestFirstParamType("meth", PsiType.INT, myFactory.createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null)); - } - - //instanceofs 81-82 - public void testT81() { - doTestFirstParamType("foo", - myFactory.createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - myFactory.createTypeFromText("A", null)); - } - - public void testT82() { - doTestFirstParamType("foo", - myFactory.createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null), - myFactory.createTypeFromText("C", null)); - } - - public void testT84() { - doTestFirstParamType("meth", - myFactory.createTypeFromText(CommonClassNames.JAVA_UTIL_SET, null), - myFactory.createTypeFromText("java.util.Set<? extends java.util.Set>", null)); - } - - public void testT85() { - doTestFieldType("str", - myFactory.createTypeFromText("java.lang.String", null), - myFactory.createTypeFromText("java.lang.Integer", null)); - } - - //array <-> list 86-89;94;95 - public void testT86() { - doTestMethodType("getArray", - myFactory.createTypeFromText("java.lang.String", null).createArrayType(), - myFactory.createTypeFromText("java.util.List<java.lang.String>", null)); - } - - public void testT87() { - doTestMethodType("getArray", - myFactory.createTypeFromText("java.util.List<java.lang.String>", null), - myFactory.createTypeFromText("java.lang.String", null).createArrayType()); - } - - public void testT88() { - doTestMethodType("getArray", - myFactory.createTypeFromText("java.lang.String", null).createArrayType(), - myFactory.createTypeFromText("java.util.List<java.lang.String>", null)); - } - - public void testT89() { - doTestMethodType("getArray", - myFactory.createTypeFromText("java.util.List<java.lang.String>", null), - myFactory.createTypeFromText("java.lang.String", null).createArrayType()); - } - - public void testT94() { - doTestMethodType("getArray", - myFactory.createTypeFromText("java.util.List<java.lang.String>", null), - myFactory.createTypeFromText("java.lang.String", null).createArrayType()); - } - - public void testT95() { - doTestMethodType("getArray", - myFactory.createTypeFromText("java.lang.String", null).createArrayType(), - myFactory.createTypeFromText("java.util.List<java.lang.String>", null)); - } - - - public void testT90() { - doTestFieldType("l", - myFactory.createTypeFromText("java.util.List<B>", null), - myFactory.createTypeFromText("java.util.List<A>", null)); - } - - //element type -> element type array - public void testT91() { - doTestMethodType("foo", - myFactory.createTypeFromText("java.lang.String", null), - myFactory.createTypeFromText("java.lang.String", null).createArrayType()); - } - - //List<S>=new ArrayList<S>{}; -> List<I>=new ArrayList<I>{}; anonymous - public void testT92() { - doTestFieldType("f", - myFactory.createTypeFromText("java.util.List<java.lang.String>", null), - myFactory.createTypeFromText("java.util.List<java.lang.Integer>", null)); - } - - //generics signature do not support primitives: Map<Boolean, String> - Map<boolean, String> - public void testT93() { - doTestFirstParamType("foo", myFactory.createTypeFromText("java.lang.Boolean", null), PsiType.BOOLEAN); - } - - //field initializers procession - public void testT96() { - doTestFieldType("f1", - myFactory.createTypeFromText("java.lang.Integer", null), - myFactory.createTypeFromText("java.lang.String", null)); - } - - public void testT97() { - doTestFieldType("f1", myFactory.createTypeFromText("java.lang.Integer", null).createArrayType(), PsiType.INT); - } - - //list <-> array conversion in assignment statements - public void testT98() { - doTestMethodType("getArray", - myFactory.createTypeFromText("java.lang.String", null).createArrayType(), - myFactory.createTypeFromText("java.util.List<java.lang.String>", null)); - } - - //escape pattern from [] - public void testT99() { - doTestFieldType("f", - myFactory.createTypeFromText("java.util.Set<java.util.List<char[]>>", null), - myFactory.createTypeFromText("java.util.Set<java.util.List<int[]>>", null)); - } - - //non formatted type - public void testT100() { - doTestFieldType("f", - myFactory.createTypeFromText("java.util.Map<java.lang.String,java.lang.String>", null), - myFactory.createTypeFromText("java.util.Map<java.lang.String,java.lang.Integer>", null)); - } - - //param List -> Array[] - public void testT101() { - doTestFirstParamType("meth", - myFactory.createTypeFromText("java.util.List<java.util.ArrayList<java.lang.Integer>>", null), - myFactory.createTypeFromText("java.util.ArrayList<java.lang.Integer>[]", null)); - } - - //param Set.add() -> Array[] with conflict - public void testT102() { - doTestFirstParamType("method", - myFactory.createTypeFromText("java.util.Set<? extends java.lang.Object>", null), - myFactory.createTypeFromText("java.lang.Object[]", null)); - } - - //set(1, "") should be assignment-checked over String - public void testT103() { - doTestFirstParamType("method", - myFactory.createTypeFromText("java.util.ArrayList<java.lang.String>", null), - myFactory.createTypeFromText("java.lang.Integer", null).createArrayType()); - } - - //raw list type now should not be changed - public void testT104() { - doTestFirstParamType("method", - myFactory.createTypeFromText("java.util.ArrayList", null), - myFactory.createTypeFromText("java.lang.String", null).createArrayType()); - } - - //implicit type parameter change 105-107 - public void testT105() { - doTestFieldType("t", - myFactory.createTypeFromText("T", null), - myFactory.createTypeFromText("java.lang.String", null)); - } - - - public void testT106() { - doTestFieldType("t", - myFactory.createTypeFromText("T", null), - myFactory.createTypeFromText("java.lang.String", null)); - } - - public void testT107() { - doTestFieldType("t", - myFactory.createTypeFromText("T", null), - myFactory.createTypeFromText("java.lang.Integer", null)); - } - - //foreach && wildcards: 108-110 - public void testT108() { - doTestFirstParamType("method", - myFactory.createTypeFromText("java.util.List<java.lang.Integer>", null), - myFactory.createTypeFromText("java.util.List<? extends java.lang.Number>", null)); - } - - public void testT109() { - doTestFirstParamType("method", - myFactory.createTypeFromText("java.util.List<java.lang.Integer>", null), - myFactory.createTypeFromText("java.util.List<? super java.lang.Number>", null)); - } - - public void testT110() { - doTestFirstParamType("method", - myFactory.createTypeFromText("java.util.List<java.lang.Integer>", null), - myFactory.createTypeFromText("java.util.List<? extends java.lang.String>", null)); - } - - //wrap with array creation only literals and refs outside of binary/unary expressions - public void testT111() { - doTestFirstParamType("method", - myFactory.createTypeFromText("java.lang.Integer", null), - myFactory.createTypeFromText("java.lang.Integer", null).createArrayType()); - } - - public void testT112() { - doTestMethodType("method", - myFactory.createTypeFromText("java.lang.Integer", null), - myFactory.createTypeFromText("java.lang.Integer", null).createArrayType()); - } - - //varargs - public void testT113() { - doTestFirstParamType("method", - new PsiEllipsisType(myFactory.createTypeFromText("java.lang.Integer", null)), - new PsiEllipsisType(myFactory.createTypeFromText("java.lang.Number", null))); - } - - public void testT114() { - doTestFirstParamType("method", - new PsiEllipsisType(myFactory.createTypeFromText("java.lang.Integer", null)), - new PsiEllipsisType(myFactory.createTypeFromText("java.lang.String", null))); - } - - //varargs && ArrayList - public void testT118() { - doTestFirstParamType("method", - myFactory.createTypeFromText("java.lang.Integer", null), - new PsiEllipsisType(myFactory.createTypeFromText("java.lang.Integer", null))); - } - - //varargs && arrays - public void testT119() { - doTestFirstParamType("method", - myFactory.createTypeFromText("java.lang.Integer", null), - new PsiEllipsisType(myFactory.createTypeFromText("java.lang.Integer", null))); - } - - public void testT120() { - doTestFirstParamType("method", - myFactory.createTypeFromText("java.lang.Integer", null), - new PsiEllipsisType(myFactory.createTypeFromText("java.lang.String", null))); - } - - //change parameter type in foreach statement: 116 - array, 117 - list - public void testT116() { - doTestFieldType("str", - myFactory.createTypeFromText("java.lang.Number", null), - myFactory.createTypeFromText("java.lang.String", null)); - } - - public void testT117() { - doTestFieldType("str", - myFactory.createTypeFromText("java.lang.Number", null), - myFactory.createTypeFromText("java.lang.String", null)); - } - - - public void testT121() { - doTestFirstParamType("method", - myFactory.createTypeFromText("java.util.ArrayList<java.lang.Number>", null), - myFactory.createTypeFromText("java.util.ArrayList<java.lang.Float>", null)); - } - - public void testT122() { - doTestFirstParamType("method", - myFactory.createTypeFromText("java.util.List<java.util.ArrayList<java.lang.Integer>>", null), - myFactory.createTypeFromText("java.util.List<java.lang.Integer>", null).createArrayType()); - } - - public void testT123() { - doTestFieldType("n", - myFactory.createTypeFromText("java.lang.Number", null), - myFactory.createTypeFromText("java.lang.Integer", null)); - } - - //124,125 - do not change formal method return type - public void testT124() { - doTestFirstParamType("meth", - myFactory.createTypeFromText("T", null), - myFactory.createTypeFromText("java.lang.Integer", null)); - } - - public void testT125() { - doTestFirstParamType("meth", - myFactory.createTypeFromText("T", null), - myFactory.createTypeFromText("java.lang.Integer", null)); - } - - public void testT126() { - doTestMethodType("meth", - myFactory.createTypeFromText("java.lang.String", null), - myFactory.createTypeFromText("T", null)); - } - - // Checking preserving method parameters alignment - public void testT127() { - getCurrentCodeStyleSettings().ALIGN_MULTILINE_PARAMETERS = true; - getCurrentCodeStyleSettings().ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true; - doTestMethodType("test234", - myFactory.createTypeFromText("int", null), - myFactory.createTypeFromText("long", null)); - } - - // test type migration from disjunction type - public void testT128() { - doTestCatchParameter(myFactory.createTypeFromText("Test.E1 | Test.E2", null), - myFactory.createTypeFromText("Test.E", null)); - } - - // test type migration to disjunction type - public void testT129() { - doTestCatchParameter(myFactory.createTypeFromText("Test.E", null), - myFactory.createTypeFromText("Test.E1 | Test.E2", null)); - } - - // test type migration from disjunction type with interfaces - public void testT130() { - doTestCatchParameter(myFactory.createTypeFromText("Test.E1 | Test.E2", null), - myFactory.createTypeFromText("Test.E", null)); - } - - // test type migration between disjunction types - public void testT131() { - doTestCatchParameter(myFactory.createTypeFromText("Test.E1 | Test.E2", null), - myFactory.createTypeFromText("Test.E2 | Test.E1", null)); - } - - private void doTestCatchParameter(final PsiType rootType, final PsiType migrationType) { - start(new RulesProvider() { - @Override - public TypeMigrationRules provide() { - final TypeMigrationRules rules = new TypeMigrationRules(rootType); - rules.setMigrationRootType(migrationType); - return rules; - } - - @Override - public PsiElement victims(final PsiClass aClass) { - final PsiCatchSection catchSection = PsiTreeUtil.findChildOfType(aClass, PsiCatchSection.class); - assert catchSection != null : aClass.getText(); - final PsiParameter parameter = catchSection.getParameter(); - assert parameter != null : catchSection.getText(); - return parameter; - } - }); - } - - // IDEA-72420 - public void testT132() { - doTestFirstParamType("h", "Test", - myFactory.createTypeFromText("J", null), - myFactory.createTypeFromText("I", null)); - } - - public void testT133() { - doTestFirstParamType("h", "Test", - myFactory.createTypeFromText("J", null), - myFactory.createTypeFromText("I", null)); - } - - public void testT134() { - doTestFirstParamType("buzz", "Test", - PsiType.INT, - myFactory.createTypeFromText("java.lang.String", null)); - } - - public void testT135() { - doTestFieldType("foo", "Test", PsiType.LONG, PsiType.INT); - } - - public void testT136() { - final GlobalSearchScope scope = GlobalSearchScope.allScope(myProject); - doTestFirstParamType("foo", "Test", - myFactory.createTypeByFQClassName(CommonClassNames.JAVA_LANG_INTEGER, scope), - PsiType.getJavaLangString(myPsiManager, scope)); - } - - public void testT137() { - doTestFirstParamType("foo", "Test", PsiType.INT, myFactory.createTypeFromText("java.lang.String", null)); - } - - public void testT138() { - doTestFirstParamType("foo", "Test", - myFactory.createTypeFromText("java.util.Set<java.lang.String>", null), - myFactory.createTypeFromText("java.util.Collection<java.lang.String>", null)); - } - - public void testT139() { - doTestForeachParameter(myFactory.createTypeFromText("java.lang.String", null), - myFactory.createTypeFromText("java.lang.Integer", null)); - } - - private void doTestForeachParameter(final PsiType rootType, final PsiType migrationType) { - start(new RulesProvider() { - @Override - public TypeMigrationRules provide() { - final TypeMigrationRules rules = new TypeMigrationRules(rootType); - rules.setMigrationRootType(migrationType); - return rules; - } - - @Override - public PsiElement victims(final PsiClass aClass) { - final PsiForeachStatement foreachStatement = PsiTreeUtil.findChildOfType(aClass, PsiForeachStatement.class); - assert foreachStatement != null : aClass.getText(); - return foreachStatement.getIterationParameter(); - } - }); - } - - - public void testTypeAnno() { - doTestFieldType("list", "Test", - myFactory.createTypeFromText("java.util.ArrayList<java.lang.@TA Integer>", null), - myFactory.createTypeFromText("java.util.Collection<java.lang.@TA Integer>", null)); - } -} diff --git a/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java b/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java deleted file mode 100644 index 8f75c4921a1c..000000000000 --- a/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java +++ /dev/null @@ -1,193 +0,0 @@ -package com.intellij.refactoring; - -import com.intellij.openapi.application.PluginPathManager; -import com.intellij.openapi.command.WriteCommandAction; -import com.intellij.openapi.fileEditor.FileDocumentManager; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.vfs.LocalFileSystem; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.PsiClass; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiField; -import com.intellij.psi.PsiType; -import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.psi.search.LocalSearchScope; -import com.intellij.refactoring.typeMigration.TypeMigrationProcessor; -import com.intellij.refactoring.typeMigration.TypeMigrationRules; -import com.intellij.usageView.UsageInfo; -import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.NotNull; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.PrintWriter; - -/** - * @author anna - * Date: 30-Apr-2008 - */ -public abstract class TypeMigrationTestBase extends MultiFileTestCase { - @Override - protected String getTestDataPath() { - return PluginPathManager.getPluginHomePath("typeMigration") + "/testData"; - } - - protected void doTestFieldType(@NonNls String fieldName, PsiType fromType, PsiType toType) { - doTestFieldType(fieldName, "Test", fromType, toType); - } - - protected void doTestFieldType(@NonNls final String fieldName, String className, final PsiType rootType, final PsiType migrationType) { - final RulesProvider provider = new RulesProvider() { - @Override - public TypeMigrationRules provide() throws Exception { - final TypeMigrationRules rules = new TypeMigrationRules(rootType); - rules.setMigrationRootType(migrationType); - return rules; - } - - @Override - public PsiElement victims(PsiClass aClass) { - final PsiField field = aClass.findFieldByName(fieldName, false); - assert field != null : fieldName + " not found in " + aClass; - return field; - } - }; - - start(provider, className); - } - - protected void doTestMethodType(@NonNls final String methodName, final PsiType rootType, final PsiType migrationType) { - doTestMethodType(methodName, "Test", rootType, migrationType); - } - - protected void doTestMethodType(@NonNls final String methodName, @NonNls String className, final PsiType rootType, final PsiType migrationType) { - final RulesProvider provider = new RulesProvider() { - @Override - public TypeMigrationRules provide() throws Exception { - final TypeMigrationRules rules = new TypeMigrationRules(rootType); - rules.setMigrationRootType(migrationType); - return rules; - } - - @Override - public PsiElement victims(PsiClass aClass) { - return aClass.findMethodsByName(methodName, false)[0]; - } - }; - - start(provider, className); - } - - protected void doTestFirstParamType(@NonNls final String methodName, final PsiType rootType, final PsiType migrationType) { - doTestFirstParamType(methodName, "Test", rootType, migrationType); - } - - protected void doTestFirstParamType(@NonNls final String methodName, String className, final PsiType rootType, final PsiType migrationType) { - final RulesProvider provider = new RulesProvider() { - @Override - public TypeMigrationRules provide() throws Exception { - final TypeMigrationRules rules = new TypeMigrationRules(rootType); - rules.setMigrationRootType(migrationType); - return rules; - } - - @Override - public PsiElement victims(PsiClass aClass) { - return aClass.findMethodsByName(methodName, false)[0].getParameterList().getParameters()[0]; - } - }; - - start(provider, className); - } - - public void start(final RulesProvider provider) { - start(provider, "Test"); - } - - public void start(final RulesProvider provider, final String className) { - doTest(new PerformAction() { - @Override - public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { - TypeMigrationTestBase.this.performAction(className, rootDir.getName(), provider); - } - }); - } - - private void performAction(String className, String rootDir, RulesProvider provider) throws Exception { - PsiClass aClass = myJavaFacade.findClass(className, GlobalSearchScope.allScope(getProject())); - - assertNotNull("Class " + className + " not found", aClass); - - final TypeMigrationRules rules = provider.provide(); - rules.setBoundScope(new LocalSearchScope(aClass.getContainingFile())); - final TestTypeMigrationProcessor pr = new TestTypeMigrationProcessor(getProject(), provider.victims(aClass), rules); - - final UsageInfo[] usages = pr.findUsages(); - final String report = pr.getLabeler().getMigrationReport(); - - WriteCommandAction.runWriteCommandAction(null, new Runnable() { - public void run() { - pr.performRefactoring(usages); - } - }); - - - String itemName = className + ".items"; - String patternName = getTestDataPath() + getTestRoot() + getTestName(true) + "/after/" + itemName; - - File patternFile = new File(patternName); - - if (!patternFile.exists()) { - PrintWriter writer = new PrintWriter(new FileOutputStream(patternFile)); - try { - writer.print(report); - writer.close(); - } - finally { - writer.close(); - } - - System.out.println("Pattern not found, file " + patternName + " created."); - - LocalFileSystem.getInstance().refreshAndFindFileByIoFile(patternFile); - } - - File graFile = new File(FileUtil.getTempDirectory() + File.separator + rootDir + File.separator + itemName); - - PrintWriter writer = new PrintWriter(new FileOutputStream(graFile)); - try { - writer.print(report); - writer.close(); - } - finally { - writer.close(); - } - - LocalFileSystem.getInstance().refreshAndFindFileByIoFile(graFile); - FileDocumentManager.getInstance().saveAllDocuments(); - } - - interface RulesProvider { - TypeMigrationRules provide() throws Exception; - - PsiElement victims(PsiClass aClass); - } - - private static class TestTypeMigrationProcessor extends TypeMigrationProcessor { - public TestTypeMigrationProcessor(final Project project, final PsiElement root, final TypeMigrationRules rules) { - super(project, root, rules); - } - - @NotNull - @Override - public UsageInfo[] findUsages() { - return super.findUsages(); - } - - @Override - public void performRefactoring(final UsageInfo[] usages) { - super.performRefactoring(usages); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/test/com/intellij/refactoring/WildcardTypeMigrationTest.java b/plugins/typeMigration/test/com/intellij/refactoring/WildcardTypeMigrationTest.java deleted file mode 100644 index d66320623f83..000000000000 --- a/plugins/typeMigration/test/com/intellij/refactoring/WildcardTypeMigrationTest.java +++ /dev/null @@ -1,170 +0,0 @@ -/* - * User: anna - * Date: 19-Aug-2009 - */ -package com.intellij.refactoring; - -import com.intellij.psi.CommonClassNames; -import org.jetbrains.annotations.NotNull; - -public class WildcardTypeMigrationTest extends TypeMigrationTestBase{ - @NotNull - @Override - protected String getTestRoot() { - return "/refactoring/wildcard/"; - } - - public void testProducerExtends() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? super java.lang.Number>", null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? extends java.lang.Number>", null)); - } - - public void testProducerSuper() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? super java.lang.Number>", null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? super java.lang.Integer>", null)); - } - - public void testProducerUnbounded() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? super java.lang.Number>", null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<?>", null)); - } - - public void testProducerCollectionChanged() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? super java.lang.Number>", null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<? super java.lang.Integer>", null)); - } - - public void testProducerExtendsCollectionChanged() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? super java.lang.Number>", null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<? extends java.lang.Object>", null)); - } - - public void testProducerStopAtWildcard() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.util.List<java.lang.Number>", null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.List<? super java.lang.Number>", null)); - } - - public void testProducerFailToStopAtWildcard() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.util.List<? super java.lang.Number>", null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.List<? super java.lang.Integer>", null)); - } - - public void testProducerExtendsFailToStopAtWildcard() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.util.List<? super java.lang.Number>", null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.List<? extends java.lang.Number>", null)); - } - - - public void testConsumerExtends() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<java.lang.Number>", null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? extends java.lang.Number>", null)); - } - - public void testConsumerSuper() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<java.lang.Number>", null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? super java.lang.Number>", null)); - } - - public void testConsumerUnbounded() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<java.lang.Number>", null), - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<?>", null)); - } - - // array -> list - public void testAssignmentExtends() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Integer", null).createArrayType(), - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? extends java.lang.Integer>", null)); - } - - public void testAssignmentSuper() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Integer", null).createArrayType(), - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? super java.lang.Integer>", null)); - } - - public void testAssignmentUnbounded() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Integer", null).createArrayType(), - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<?>", null)); - } - - public void testGetExtends() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Integer", null).createArrayType(), - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? extends java.lang.Integer>", null)); - } - - public void testGetSuper() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Integer", null).createArrayType(), - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? super java.lang.Integer>", null)); - } - - public void testGetUnbounded() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Integer", null).createArrayType(), - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<?>", null)); - - } - - public void testLengthSize() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Integer", null).createArrayType(), - myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<?>", null)); - - } - - //list -> array - public void testGetAssignmentExtendsToType() throws Exception { - doTestFirstParamType("method", myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? extends java.lang.Number>", null), - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Number", null).createArrayType()); - } - - public void testGetAssignmentExtendsToSuperType() throws Exception { - doTestFirstParamType("method", myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? extends java.lang.Number>", null), - myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null).createArrayType()); - } - - public void testGetAssignmentExtendsToChildType() throws Exception { - doTestFirstParamType("method", myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? extends java.lang.Number>", null), - myJavaFacade.getElementFactory().createTypeFromText("java.lang.Integer", null).createArrayType()); - } - - // -> threadlocal with wildcard - public void testThreadLocalProducerExtends() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.util.List<java.lang.String>", null), - myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal<java.util.List<? extends String>>", null)); - } - - //List<? super String> is not assignable to List<String> though it is possible to pass string where ? super String was - public void _testThreadLocalProducerSuper() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.util.List<java.lang.String>", null), - myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal<java.util.List<? super String>>", null)); - } - - public void testThreadLocalConsumerSuper() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null), - myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal<? super String>", null)); - } - - public void testThreadLocalConsumerExtends() throws Exception { - doTestFirstParamType("method", - myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null), - myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal<? extends String>", null)); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/after1.java b/plugins/typeMigration/testData/intentions/atomic/after1.java deleted file mode 100644 index 853f715fd8c4..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/after1.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.concurrent.atomic.AtomicIntegerArray; - -// "Convert to atomic" "true" -class Test { - final AtomicIntegerArray field= new AtomicIntegerArray(foo()); - int[] foo() { - return null; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/after10.java b/plugins/typeMigration/testData/intentions/atomic/after10.java deleted file mode 100644 index 685e3fb710e2..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/after10.java +++ /dev/null @@ -1,10 +0,0 @@ -import java.util.concurrent.atomic.AtomicInteger; - -// "Convert to atomic" "true" -class Test { - final AtomicInteger o = new AtomicInteger(0); - - void foo() { - boolean b = this.o.get() == 1; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/after12.java b/plugins/typeMigration/testData/intentions/atomic/after12.java deleted file mode 100644 index 8accafd9fa10..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/after12.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.concurrent.atomic.AtomicInteger; - -// "Convert to atomic" "true" -class Test { - - { - AtomicInteger i = new AtomicInteger(0); - Integer j = 0; - - assert j == i.get(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/after13.java b/plugins/typeMigration/testData/intentions/atomic/after13.java deleted file mode 100644 index dea58d02e88c..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/after13.java +++ /dev/null @@ -1,6 +0,0 @@ -import java.util.concurrent.atomic.AtomicInteger; - -// "Convert to atomic" "true" -class Test { - final AtomicInteger i = new AtomicInteger(0); -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/after14.java b/plugins/typeMigration/testData/intentions/atomic/after14.java deleted file mode 100644 index 6109d4106e9b..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/after14.java +++ /dev/null @@ -1,10 +0,0 @@ -import java.util.concurrent.atomic.AtomicLong; - -// "Convert to atomic" "true" -class T { - private final AtomicLong l = new AtomicLong(10L); - - public synchronized void update(long m) { - l.set(m); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/after2.java b/plugins/typeMigration/testData/intentions/atomic/after2.java deleted file mode 100644 index 2c2ad94beeb0..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/after2.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.concurrent.atomic.AtomicReferenceArray; - -// "Convert to atomic" "true" -class Test { - final AtomicReferenceArray<Object> field= new AtomicReferenceArray<>(foo()); - Object[] foo() { - return null; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/after3.java b/plugins/typeMigration/testData/intentions/atomic/after3.java deleted file mode 100644 index 505349d5dc36..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/after3.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.concurrent.atomic.AtomicIntegerArray; - -// "Convert to atomic" "true" -class Test { - final AtomicIntegerArray field= new AtomicIntegerArray(new int[]{1}); - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/after4.java b/plugins/typeMigration/testData/intentions/atomic/after4.java deleted file mode 100644 index e268b2604404..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/after4.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.concurrent.atomic.AtomicInteger; - -// "Convert to atomic" "true" -class Test { - final AtomicInteger i = new AtomicInteger(0); - - int j = i.get() + 5; - String s = "i = " + i.get(); -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/after5.java b/plugins/typeMigration/testData/intentions/atomic/after5.java deleted file mode 100644 index 82ff84c68e75..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/after5.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.concurrent.atomic.AtomicInteger; - -// "Convert to atomic" "true" -class Test { - final AtomicInteger i = new AtomicInteger(0 + 8); - - int j = i.get() + 5; - String s = "i = " + i.get(); -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/after6.java b/plugins/typeMigration/testData/intentions/atomic/after6.java deleted file mode 100644 index f0120300e0f9..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/after6.java +++ /dev/null @@ -1,6 +0,0 @@ -import java.util.concurrent.atomic.AtomicIntegerArray; - -// "Convert to atomic" "true" -class Test { - final AtomicIntegerArray i = new AtomicIntegerArray(new int[0]); -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/after7.java b/plugins/typeMigration/testData/intentions/atomic/after7.java deleted file mode 100644 index 19336f0bc61b..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/after7.java +++ /dev/null @@ -1,11 +0,0 @@ -import java.util.concurrent.atomic.AtomicInteger; - -// "Convert to atomic" "true" -class Test { - final AtomicInteger o = new AtomicInteger(0); - int j = o.get(); - - void foo() { - while ((o = j) != 0) {} - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/after8.java b/plugins/typeMigration/testData/intentions/atomic/after8.java deleted file mode 100644 index bdfbd5b03a4d..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/after8.java +++ /dev/null @@ -1,11 +0,0 @@ -import java.util.concurrent.atomic.AtomicInteger; - -// "Convert to atomic" "true" -class Test { - final AtomicInteger o = new AtomicInteger(); - int j = o.get(); - - void foo() { - while ((o = j) != 0) {} - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/after9.java b/plugins/typeMigration/testData/intentions/atomic/after9.java deleted file mode 100644 index c462a10961d4..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/after9.java +++ /dev/null @@ -1,15 +0,0 @@ -import java.util.concurrent.atomic.AtomicInteger; - -// "Convert to atomic" "true" -class Test { - final AtomicInteger o; - int j = o.get(); - - Test(int o) { - this.o = new AtomicInteger(o); - } - - void foo() { - while ((o = j) != 0) {} - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/afterExcl.java b/plugins/typeMigration/testData/intentions/atomic/afterExcl.java deleted file mode 100644 index 72f91198ce3d..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/afterExcl.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.concurrent.atomic.AtomicBoolean; - -// "Convert to atomic" "true" -class Test { - final AtomicBoolean field= new AtomicBoolean(false); - { - boolean b = !field.get(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/afterTA1.java b/plugins/typeMigration/testData/intentions/atomic/afterTA1.java deleted file mode 100644 index a90ed666ea30..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/afterTA1.java +++ /dev/null @@ -1,10 +0,0 @@ -// "Convert to atomic" "true" -import java.lang.annotation.*; -import java.util.concurrent.atomic.AtomicReference; - -@Target(value = ElementType.TYPE_USE) -public @interface TA { int value(); } - -class T { - final AtomicReference<@TA(42) String> v = new AtomicReference<String>(); -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/before1.java b/plugins/typeMigration/testData/intentions/atomic/before1.java deleted file mode 100644 index d3b926f29fb3..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/before1.java +++ /dev/null @@ -1,7 +0,0 @@ -// "Convert to atomic" "true" -class Test { - int[] <caret>field=foo(); - int[] foo() { - return null; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/before10.java b/plugins/typeMigration/testData/intentions/atomic/before10.java deleted file mode 100644 index a4e7c9db6b75..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/before10.java +++ /dev/null @@ -1,8 +0,0 @@ -// "Convert to atomic" "true" -class Test { - final int <caret>o = 0; - - void foo() { - boolean b = this.o == 1; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/before11.java b/plugins/typeMigration/testData/intentions/atomic/before11.java deleted file mode 100644 index b1abb55f9503..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/before11.java +++ /dev/null @@ -1,8 +0,0 @@ -// "Convert to atomic" "false" -class Test { - void foo() { - try (AutoCloseable <caret>r = null) { - System.out.println(r); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/before12.java b/plugins/typeMigration/testData/intentions/atomic/before12.java deleted file mode 100644 index 2c634df22c2f..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/before12.java +++ /dev/null @@ -1,10 +0,0 @@ -// "Convert to atomic" "true" -class Test { - - { - int <caret>i = 0; - Integer j = 0; - - assert j == i; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/before13.java b/plugins/typeMigration/testData/intentions/atomic/before13.java deleted file mode 100644 index 179e2b165252..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/before13.java +++ /dev/null @@ -1,4 +0,0 @@ -// "Convert to atomic" "true" -class Test { - volatile int <caret>i = 0; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/before14.java b/plugins/typeMigration/testData/intentions/atomic/before14.java deleted file mode 100644 index 042b4c4dd2a1..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/before14.java +++ /dev/null @@ -1,8 +0,0 @@ -// "Convert to atomic" "true" -class T { - private long <caret>l = 10L; - - public synchronized void update(long m) { - l = m; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/before2.java b/plugins/typeMigration/testData/intentions/atomic/before2.java deleted file mode 100644 index d33fffc40e20..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/before2.java +++ /dev/null @@ -1,7 +0,0 @@ -// "Convert to atomic" "true" -class Test { - Object[] <caret>field=foo(); - Object[] foo() { - return null; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/before3.java b/plugins/typeMigration/testData/intentions/atomic/before3.java deleted file mode 100644 index 661dbdd63fb2..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/before3.java +++ /dev/null @@ -1,5 +0,0 @@ -// "Convert to atomic" "true" -class Test { - int[] <caret>field= new int[]{1}; - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/before4.java b/plugins/typeMigration/testData/intentions/atomic/before4.java deleted file mode 100644 index ecf4b985a5d2..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/before4.java +++ /dev/null @@ -1,7 +0,0 @@ -// "Convert to atomic" "true" -class Test { - int <caret>i = 0; - - int j = i + 5; - String s = "i = " + i; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/before5.java b/plugins/typeMigration/testData/intentions/atomic/before5.java deleted file mode 100644 index 7ace336aa8be..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/before5.java +++ /dev/null @@ -1,7 +0,0 @@ -// "Convert to atomic" "true" -class Test { - int <caret>i = 0 + 8; - - int j = i + 5; - String s = "i = " + i; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/before6.java b/plugins/typeMigration/testData/intentions/atomic/before6.java deleted file mode 100644 index abc59802e025..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/before6.java +++ /dev/null @@ -1,4 +0,0 @@ -// "Convert to atomic" "true" -class Test { - int[] <caret>i = new int[0]; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/before7.java b/plugins/typeMigration/testData/intentions/atomic/before7.java deleted file mode 100644 index fd2d066a4337..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/before7.java +++ /dev/null @@ -1,9 +0,0 @@ -// "Convert to atomic" "true" -class Test { - int <caret>o = 0; - int j = o; - - void foo() { - while ((o = j) != 0) {} - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/before8.java b/plugins/typeMigration/testData/intentions/atomic/before8.java deleted file mode 100644 index d2ef50810f7e..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/before8.java +++ /dev/null @@ -1,9 +0,0 @@ -// "Convert to atomic" "true" -class Test { - int <caret>o; - int j = o; - - void foo() { - while ((o = j) != 0) {} - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/before9.java b/plugins/typeMigration/testData/intentions/atomic/before9.java deleted file mode 100644 index a9f693800f81..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/before9.java +++ /dev/null @@ -1,13 +0,0 @@ -// "Convert to atomic" "true" -class Test { - final int <caret>o; - int j = o; - - Test(int o) { - this.o = o; - } - - void foo() { - while ((o = j) != 0) {} - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/beforeExcl.java b/plugins/typeMigration/testData/intentions/atomic/beforeExcl.java deleted file mode 100644 index 3df455583c35..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/beforeExcl.java +++ /dev/null @@ -1,7 +0,0 @@ -// "Convert to atomic" "true" -class Test { - boolean <caret>field=false; - { - boolean b = !field; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/atomic/beforeTA1.java b/plugins/typeMigration/testData/intentions/atomic/beforeTA1.java deleted file mode 100644 index 10bdd5df4822..000000000000 --- a/plugins/typeMigration/testData/intentions/atomic/beforeTA1.java +++ /dev/null @@ -1,9 +0,0 @@ -// "Convert to atomic" "true" -import java.lang.annotation.*; - -@Target(value = ElementType.TYPE_USE) -public @interface TA { int value(); } - -class T { - @TA(42) String <caret>v; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/threadLocal/after1.java b/plugins/typeMigration/testData/intentions/threadLocal/after1.java deleted file mode 100644 index b5df8fd35214..000000000000 --- a/plugins/typeMigration/testData/intentions/threadLocal/after1.java +++ /dev/null @@ -1,12 +0,0 @@ -// "Convert to ThreadLocal" "true" -class Test { - final ThreadLocal<Integer> field = new ThreadLocal<Integer>() { - @Override - protected Integer initialValue() { - return 0; - } - }; - void foo() { - field.set(field.get() + 1); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/threadLocal/after2.java b/plugins/typeMigration/testData/intentions/threadLocal/after2.java deleted file mode 100644 index 3a546c5b0c9a..000000000000 --- a/plugins/typeMigration/testData/intentions/threadLocal/after2.java +++ /dev/null @@ -1,12 +0,0 @@ -// "Convert to ThreadLocal" "true" -class Test { - final ThreadLocal<String> field = new ThreadLocal<String>() { - @Override - protected String initialValue() { - return ""; - } - }; - void foo() { - System.out.println(field.get()); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/threadLocal/after3.java b/plugins/typeMigration/testData/intentions/threadLocal/after3.java deleted file mode 100644 index 9fc0f825ac4b..000000000000 --- a/plugins/typeMigration/testData/intentions/threadLocal/after3.java +++ /dev/null @@ -1,12 +0,0 @@ -// "Convert to ThreadLocal" "true" -class Test { - final ThreadLocal<Integer> field = new ThreadLocal<Integer>() { - @Override - protected Integer initialValue() { - return new Integer(0); - } - }; - void foo() { - if (field.get() == null) return; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/threadLocal/after4.java b/plugins/typeMigration/testData/intentions/threadLocal/after4.java deleted file mode 100644 index 8410a1c33c0e..000000000000 --- a/plugins/typeMigration/testData/intentions/threadLocal/after4.java +++ /dev/null @@ -1,12 +0,0 @@ -// "Convert to ThreadLocal" "true" -class Test { - final ThreadLocal<String> field = new ThreadLocal<String>() { - @Override - protected String initialValue() { - return ""; - } - }; - void foo() { - if (field.get().indexOf("a") == -1) return; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/threadLocal/after5.java b/plugins/typeMigration/testData/intentions/threadLocal/after5.java deleted file mode 100644 index 435e1b6a50e6..000000000000 --- a/plugins/typeMigration/testData/intentions/threadLocal/after5.java +++ /dev/null @@ -1,12 +0,0 @@ -// "Convert to ThreadLocal" "true" -class Test { - final ThreadLocal<Integer> field = new ThreadLocal<Integer>() { - @Override - protected Integer initialValue() { - return new Integer(0); - } - }; - void foo(Test t) { - if (t.field.get() == null) return; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/threadLocal/after6.java b/plugins/typeMigration/testData/intentions/threadLocal/after6.java deleted file mode 100644 index 1879a46be16d..000000000000 --- a/plugins/typeMigration/testData/intentions/threadLocal/after6.java +++ /dev/null @@ -1,12 +0,0 @@ -// "Convert to ThreadLocal" "true" -class Test { - static final ThreadLocal<Integer> field; - static { - field = new ThreadLocal<Integer>() { - @Override - protected Integer initialValue() { - return new Integer(0); - } - }; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/threadLocal/after7.java b/plugins/typeMigration/testData/intentions/threadLocal/after7.java deleted file mode 100644 index 5398ff5e2991..000000000000 --- a/plugins/typeMigration/testData/intentions/threadLocal/after7.java +++ /dev/null @@ -1,15 +0,0 @@ -// "Convert to ThreadLocal" "true" -class X { - private final ThreadLocal<byte[]> bytes = new ThreadLocal<byte[]>() { - @Override - protected byte[] initialValue() { - return new byte[10]; - } - }; - - byte foo(byte b) { - bytes.get()[0] = 1; - foo(bytes.get()[1]) - return bytes.get()[2]; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/threadLocal/after8.java b/plugins/typeMigration/testData/intentions/threadLocal/after8.java deleted file mode 100644 index d158894b6130..000000000000 --- a/plugins/typeMigration/testData/intentions/threadLocal/after8.java +++ /dev/null @@ -1,9 +0,0 @@ -// "Convert to ThreadLocal" "true" -class X { - final ThreadLocal<Integer> i = new ThreadLocal<Integer>() { - @Override - protected Integer initialValue() { - return 0; - } - }; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/threadLocal/afterTA1.java b/plugins/typeMigration/testData/intentions/threadLocal/afterTA1.java deleted file mode 100644 index 0e3687e146b6..000000000000 --- a/plugins/typeMigration/testData/intentions/threadLocal/afterTA1.java +++ /dev/null @@ -1,14 +0,0 @@ -// "Convert to ThreadLocal" "true" -import java.lang.annotation.*; - -@Target(value = ElementType.TYPE_USE) -public @interface TA { int value(); } - -class Test { - final ThreadLocal<@TA(42) Integer> field = new ThreadLocal<Integer>() { - @Override - protected Integer initialValue() { - return 0; - } - }; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/threadLocal/before1.java b/plugins/typeMigration/testData/intentions/threadLocal/before1.java deleted file mode 100644 index e35925390137..000000000000 --- a/plugins/typeMigration/testData/intentions/threadLocal/before1.java +++ /dev/null @@ -1,7 +0,0 @@ -// "Convert to ThreadLocal" "true" -class Test { - int <caret>field=0; - void foo() { - field++; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/threadLocal/before2.java b/plugins/typeMigration/testData/intentions/threadLocal/before2.java deleted file mode 100644 index 47c6471739d7..000000000000 --- a/plugins/typeMigration/testData/intentions/threadLocal/before2.java +++ /dev/null @@ -1,7 +0,0 @@ -// "Convert to ThreadLocal" "true" -class Test { - String <caret>field=""; - void foo() { - System.out.println(field); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/threadLocal/before3.java b/plugins/typeMigration/testData/intentions/threadLocal/before3.java deleted file mode 100644 index 19d296cffa36..000000000000 --- a/plugins/typeMigration/testData/intentions/threadLocal/before3.java +++ /dev/null @@ -1,7 +0,0 @@ -// "Convert to ThreadLocal" "true" -class Test { - Integer <caret>field=new Integer(0); - void foo() { - if (field == null) return; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/threadLocal/before4.java b/plugins/typeMigration/testData/intentions/threadLocal/before4.java deleted file mode 100644 index 66d2efa6230a..000000000000 --- a/plugins/typeMigration/testData/intentions/threadLocal/before4.java +++ /dev/null @@ -1,7 +0,0 @@ -// "Convert to ThreadLocal" "true" -class Test { - String <caret>field=""; - void foo() { - if (field.indexOf("a") == -1) return; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/threadLocal/before5.java b/plugins/typeMigration/testData/intentions/threadLocal/before5.java deleted file mode 100644 index c459443241e4..000000000000 --- a/plugins/typeMigration/testData/intentions/threadLocal/before5.java +++ /dev/null @@ -1,7 +0,0 @@ -// "Convert to ThreadLocal" "true" -class Test { - Integer <caret>field=new Integer(0); - void foo(Test t) { - if (t.field == null) return; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/threadLocal/before6.java b/plugins/typeMigration/testData/intentions/threadLocal/before6.java deleted file mode 100644 index 74427e6e4f06..000000000000 --- a/plugins/typeMigration/testData/intentions/threadLocal/before6.java +++ /dev/null @@ -1,7 +0,0 @@ -// "Convert to ThreadLocal" "true" -class Test { - static final Integer <caret>field; - static { - field = new Integer(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/threadLocal/before7.java b/plugins/typeMigration/testData/intentions/threadLocal/before7.java deleted file mode 100644 index dfff0417b272..000000000000 --- a/plugins/typeMigration/testData/intentions/threadLocal/before7.java +++ /dev/null @@ -1,10 +0,0 @@ -// "Convert to ThreadLocal" "true" -class X { - private final byte[] <caret>bytes = new byte[10]; - - byte foo(byte b) { - bytes[0] = 1; - foo(bytes[1]) - return bytes[2]; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/threadLocal/before8.java b/plugins/typeMigration/testData/intentions/threadLocal/before8.java deleted file mode 100644 index af321e0da56c..000000000000 --- a/plugins/typeMigration/testData/intentions/threadLocal/before8.java +++ /dev/null @@ -1,4 +0,0 @@ -// "Convert to ThreadLocal" "true" -class X { - volatile int <caret>i = 0; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/intentions/threadLocal/beforeTA1.java b/plugins/typeMigration/testData/intentions/threadLocal/beforeTA1.java deleted file mode 100644 index ac3409c2e759..000000000000 --- a/plugins/typeMigration/testData/intentions/threadLocal/beforeTA1.java +++ /dev/null @@ -1,9 +0,0 @@ -// "Convert to ThreadLocal" "true" -import java.lang.annotation.*; - -@Target(value = ElementType.TYPE_USE) -public @interface TA { int value(); } - -class Test { - @TA(42) int <caret>field = 0; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/CompositeReturnType.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/CompositeReturnType.java deleted file mode 100644 index 051e42810e3d..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/CompositeReturnType.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.List; -class A<T> { - List<T> getKey(){return null;} -} -public class B extends A<S<caret>tring> { - List<String> getKey() { - return new List<String>(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/CompositeReturnType.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/CompositeReturnType.java.after deleted file mode 100644 index 8966bc1ee03d..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/CompositeReturnType.java.after +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.List; -class A<T> { - List<T> getKey(){return null;} -} -public class B extends A<Object> { - List<Object> getKey() { - return new List<>(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/FieldTypeMigration.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/FieldTypeMigration.java deleted file mode 100644 index fabb24302b8d..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/FieldTypeMigration.java +++ /dev/null @@ -1,12 +0,0 @@ -class Test { - interface A<T> { - void foo(T t); - } - - class B implements A<Inte<caret>ger> { - Integer str; - public void foo(Integer s) { - str = s; - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/FieldTypeMigration.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/FieldTypeMigration.java.after deleted file mode 100644 index 01a6bf49322e..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/FieldTypeMigration.java.after +++ /dev/null @@ -1,12 +0,0 @@ -class Test { - interface A<T> { - void foo(T t); - } - - class B implements A<String> { - String str; - public void foo(String s) { - str = s; - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/FieldUsage.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/FieldUsage.java deleted file mode 100644 index 92864f163560..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/FieldUsage.java +++ /dev/null @@ -1,16 +0,0 @@ -import java.util.List; - -class A<T> { - T t; - List<T> list = new List<T>(); -} - -class B extends A<S<caret>tring> { - void foo() { - if (t == null) return; - if (list == null) return; - for (String s : list) { - //do nothing - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/FieldUsage.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/FieldUsage.java.after deleted file mode 100644 index 07ee7a4e9351..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/FieldUsage.java.after +++ /dev/null @@ -1,16 +0,0 @@ -import java.util.List; - -class A<T> { - T t; - List<T> list = new List<T>(); -} - -class B extends A<Object> { - void foo() { - if (t == null) return; - if (list == null) return; - for (Object s : list) { - //do nothing - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/FieldUsage1.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/FieldUsage1.java deleted file mode 100644 index bff01e33a9e3..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/FieldUsage1.java +++ /dev/null @@ -1,17 +0,0 @@ -import java.util.*; - -class A<T> { - protected T t; - protected List<T> list = new ArrayList<T>(); -} - -public class B extends A<S<caret>tring> { - void foo() { - if (t == null) return; - if (list == null) return; - System.out.println(t); - for (String s : list) { - //do nothing - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/FieldUsage1.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/FieldUsage1.java.after deleted file mode 100644 index b3764fda80de..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/FieldUsage1.java.after +++ /dev/null @@ -1,17 +0,0 @@ -import java.util.*; - -class A<T> { - protected T t; - protected List<T> list = new ArrayList<T>(); -} - -public class B extends A<Object> { - void foo() { - if (t == null) return; - if (list == null) return; - System.out.println(t); - for (Object s : list) { - //do nothing - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ListTypeArguments.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/ListTypeArguments.java deleted file mode 100644 index 98b178156750..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ListTypeArguments.java +++ /dev/null @@ -1,4 +0,0 @@ -import java.util.List; -class ListTypeArguments implements List<I<caret>nteger> { - public boolean add(Integer o){return true;} -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ListTypeArguments.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/ListTypeArguments.java.after deleted file mode 100644 index 535acf216d57..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ListTypeArguments.java.after +++ /dev/null @@ -1,4 +0,0 @@ -import java.util.List; -class ListTypeArguments implements List<Object> { - public boolean add(Object o){return true;} -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/MethodReturnTypeMigration.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/MethodReturnTypeMigration.java deleted file mode 100644 index 8183831c3ff3..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/MethodReturnTypeMigration.java +++ /dev/null @@ -1,16 +0,0 @@ -class Test { - interface A<T> { - T foo(); - } - - class B implements A<Stri<caret>ng> { - public String foo() { - return null; - } - - public void bar() { - String s = foo(); - } - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/MethodReturnTypeMigration.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/MethodReturnTypeMigration.java.after deleted file mode 100644 index 405cd8a74384..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/MethodReturnTypeMigration.java.after +++ /dev/null @@ -1,16 +0,0 @@ -class Test { - interface A<T> { - T foo(); - } - - class B implements A<Integer> { - public Integer foo() { - return null; - } - - public void bar() { - Integer s = foo(); - } - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ParameterMigration.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/ParameterMigration.java deleted file mode 100644 index fdce63b995a8..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ParameterMigration.java +++ /dev/null @@ -1,29 +0,0 @@ -import java.util.*; - -class Test { - class C<T> { - List<T> l; - - void bar(Map<T, T> t){} - - void f(T t){} - - } - - class D extends C<Strin<caret>g> { - void foo(String s) { - f(s); - } - - public void main() { - for (String integer : l) { - - } - } - - void bar(Map<String, String> t) { - super.bar(t); - } - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ParameterMigration.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/ParameterMigration.java.after deleted file mode 100644 index ff031aa42904..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ParameterMigration.java.after +++ /dev/null @@ -1,29 +0,0 @@ -import java.util.*; - -class Test { - class C<T> { - List<T> l; - - void bar(Map<T, T> t){} - - void f(T t){} - - } - - class D extends C<Object> { - void foo(String s) { - f(s); - } - - public void main() { - for (Object integer : l) { - - } - } - - void bar(Map<Object, Object> t) { - super.bar(t); - } - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ParameterMigration1.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/ParameterMigration1.java deleted file mode 100644 index fdce63b995a8..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ParameterMigration1.java +++ /dev/null @@ -1,29 +0,0 @@ -import java.util.*; - -class Test { - class C<T> { - List<T> l; - - void bar(Map<T, T> t){} - - void f(T t){} - - } - - class D extends C<Strin<caret>g> { - void foo(String s) { - f(s); - } - - public void main() { - for (String integer : l) { - - } - } - - void bar(Map<String, String> t) { - super.bar(t); - } - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ParameterMigration1.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/ParameterMigration1.java.after deleted file mode 100644 index f3cef5b65bba..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ParameterMigration1.java.after +++ /dev/null @@ -1,29 +0,0 @@ -import java.util.*; - -class Test { - class C<T> { - List<T> l; - - void bar(Map<T, T> t){} - - void f(T t){} - - } - - class D extends C<Integer> { - void foo(Integer s) { - f(s); - } - - public void main() { - for (Integer integer : l) { - - } - } - - void bar(Map<Integer, Integer> t) { - super.bar(t); - } - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ParameterMigration2.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/ParameterMigration2.java deleted file mode 100644 index 278b80eb95d5..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ParameterMigration2.java +++ /dev/null @@ -1,31 +0,0 @@ -import java.util.*; - -class Test { - class C<T> { - List<T> l; - - void bar(Map<T, T> t){ - for (T t1 : t.keySet()) {} - } - - void f(T t){} - - } - - class D extends C<Strin<caret>g> { - void foo(String s) { - f(s); - } - - public void main() { - for (String integer : l) { - - } - } - - void bar(Map<String, String> t) { - super.bar(t); - } - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ParameterMigration2.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/ParameterMigration2.java.after deleted file mode 100644 index 5978a88ee283..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ParameterMigration2.java.after +++ /dev/null @@ -1,31 +0,0 @@ -import java.util.*; - -class Test { - class C<T> { - List<T> l; - - void bar(Map<T, T> t){ - for (T t1 : t.keySet()) {} - } - - void f(T t){} - - } - - class D extends C<Integer> { - void foo(Integer s) { - f(s); - } - - public void main() { - for (Integer integer : l) { - - } - } - - void bar(Map<Integer, Integer> t) { - super.bar(t); - } - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter.java deleted file mode 100644 index 416bf0f810b8..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter.java +++ /dev/null @@ -1,16 +0,0 @@ -class A<T> { - void foo(T t){} - void bar(T t, int i){} -} - -class B extends A<S<caret>tring>{ - void foo(String t) { - super.foo(t); - } - - void bar(String t, int i){ - foo(t); - int k = i; - super.bar(t, k); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter.java.after deleted file mode 100644 index 64847ab2afd1..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter.java.after +++ /dev/null @@ -1,16 +0,0 @@ -class A<T> { - void foo(T t){} - void bar(T t, int i){} -} - -class B extends A<Object> { - void foo(Object t) { - super.foo(t); - } - - void bar(Object t, int i){ - foo(t); - int k = i; - super.bar(t, k); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter1.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter1.java deleted file mode 100644 index f9bdb275f3aa..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter1.java +++ /dev/null @@ -1,20 +0,0 @@ -class A<T> { - void foo(T t){} - void bar(T t, int i){} -} - -class B extends A<S<caret>tring>{ - void foo(String t) { - super.foo(t); - } - - void bar(String t, int i){ - foo(t); - int k = i; - super.bar(t, k); - } - - void bar1(String s) { - foo(s); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter1.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter1.java.after deleted file mode 100644 index 1777cb6da9d8..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter1.java.after +++ /dev/null @@ -1,20 +0,0 @@ -class A<T> { - void foo(T t){} - void bar(T t, int i){} -} - -class B extends A<Integer> { - void foo(Integer t) { - super.foo(t); - } - - void bar(Integer t, int i){ - foo(t); - int k = i; - super.bar(t, k); - } - - void bar1(Integer s) { - foo(s); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter2.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter2.java deleted file mode 100644 index 62c7cf4da263..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter2.java +++ /dev/null @@ -1,12 +0,0 @@ -class A<T> { - T bar(){} -} - -class B extends A<S<caret>tring>{ - void barInner(String s) { - } - - void foo() { - barInner(bar()); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter2.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter2.java.after deleted file mode 100644 index e5ed5910c2c1..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter2.java.after +++ /dev/null @@ -1,12 +0,0 @@ -class A<T> { - T bar(){} -} - -class B extends A<Object> { - void barInner(Object s) { - } - - void foo() { - barInner(bar()); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ReturnType.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/ReturnType.java deleted file mode 100644 index 17960b186a46..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ReturnType.java +++ /dev/null @@ -1,14 +0,0 @@ -class A<T> { - T foo(){ - return null; - } -} - -class B extends A<S<caret>tring> { - String foo(){return null;} - - void bar() { - foo(); - if (foo() == null) return; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ReturnType.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/ReturnType.java.after deleted file mode 100644 index 1758610f1571..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ReturnType.java.after +++ /dev/null @@ -1,14 +0,0 @@ -class A<T> { - T foo(){ - return null; - } -} - -class B extends A<Object> { - Object foo(){return null;} - - void bar() { - foo(); - if (foo() == null) return; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ReturnType1.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/ReturnType1.java deleted file mode 100644 index 9e01a295be05..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ReturnType1.java +++ /dev/null @@ -1,15 +0,0 @@ -class A<T> { - T foo(){ - return null; - } -} - -public class B extends A<S<caret>tring> { - String foo(){return null;} - - void bar() { - foo(); - if (foo() == null) return; - System.out.println(foo()); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ReturnType1.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/ReturnType1.java.after deleted file mode 100644 index 8a584bdca610..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ReturnType1.java.after +++ /dev/null @@ -1,15 +0,0 @@ -class A<T> { - T foo(){ - return null; - } -} - -public class B extends A<Object> { - Object foo(){return null;} - - void bar() { - foo(); - if (foo() == null) return; - System.out.println(foo()); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ReturnType2.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/ReturnType2.java deleted file mode 100644 index 83b7294972fc..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ReturnType2.java +++ /dev/null @@ -1,14 +0,0 @@ -class A<T> { - T foo(){ - return null; - } -} - -class B extends A<S<caret>tring> { - String foo(){return super.foo();} - - void bar() { - foo(); - if (foo() == null) return; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ReturnType2.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/ReturnType2.java.after deleted file mode 100644 index a26f7d3f1655..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/ReturnType2.java.after +++ /dev/null @@ -1,14 +0,0 @@ -class A<T> { - T foo(){ - return null; - } -} - -class B extends A<Object> { - Object foo(){return super.foo();} - - void bar() { - foo(); - if (foo() == null) return; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchy.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchy.java deleted file mode 100644 index 2bfa264828c0..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchy.java +++ /dev/null @@ -1,18 +0,0 @@ -abstract class A<E> { - abstract E foo(); -} - -abstract class B<T> extends A<T> { -} - -class C extends B<S<caret>tring> { - String foo() { - return null; - } - - void bar() { - if (foo() == null) { - //do smth - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchy.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchy.java.after deleted file mode 100644 index 4c4736302857..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchy.java.after +++ /dev/null @@ -1,18 +0,0 @@ -abstract class A<E> { - abstract E foo(); -} - -abstract class B<T> extends A<T> { -} - -class C extends B<Object> { - Object foo() { - return null; - } - - void bar() { - if (foo() == null) { - //do smth - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchy1.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchy1.java deleted file mode 100644 index 5396a7c59422..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchy1.java +++ /dev/null @@ -1,19 +0,0 @@ -abstract class A<E> { - public abstract E foo(); -} - -abstract class B<T> extends A<T> { -} - -public class C extends B<S<caret>tring> { - public String foo() { - return null; - } - - void bar() { - if (foo() == null) { - //do smth - } - System.out.println(foo()); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchy1.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchy1.java.after deleted file mode 100644 index 16a02ae4ea3d..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchy1.java.after +++ /dev/null @@ -1,19 +0,0 @@ -abstract class A<E> { - public abstract E foo(); -} - -abstract class B<T> extends A<T> { -} - -public class C extends B<Object> { - public Object foo() { - return null; - } - - void bar() { - if (foo() == null) { - //do smth - } - System.out.println(foo()); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchy2.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchy2.java deleted file mode 100644 index 2eb6d429915e..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchy2.java +++ /dev/null @@ -1,18 +0,0 @@ -public class Test extends B<S<caret>tring>{ - String foo() { - return null; - } - - void bar() { - if (foo() == null) {} - } -} - -abstract class A<T> { - abstract T foo(); -} - -abstract class B<E extends Object> extends A<E> { -} - - diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchy2.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchy2.java.after deleted file mode 100644 index b30ab01e5594..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchy2.java.after +++ /dev/null @@ -1,18 +0,0 @@ -public class Test extends B<Object> { - Object foo() { - return null; - } - - void bar() { - if (foo() == null) {} - } -} - -abstract class A<T> { - abstract T foo(); -} - -abstract class B<E extends Object> extends A<E> { -} - - diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchyFieldUsage.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchyFieldUsage.java deleted file mode 100644 index 3bf853421127..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchyFieldUsage.java +++ /dev/null @@ -1,15 +0,0 @@ -import java.util.List; -class A<E> { - E e; - List<E> list = new List<E>(); -} - -class B<T> extends A<T> {} - -class C extends B <S<caret>tring> { - void foo() { - if (e == null && list != null) { - //do smth - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchyFieldUsage.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchyFieldUsage.java.after deleted file mode 100644 index 5eeea8234a2e..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchyFieldUsage.java.after +++ /dev/null @@ -1,15 +0,0 @@ -import java.util.List; -class A<E> { - E e; - List<E> list = new List<E>(); -} - -class B<T> extends A<T> {} - -class C extends B<Object> { - void foo() { - if (e == null && list != null) { - //do smth - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchyFieldUsageConflict.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchyFieldUsageConflict.java deleted file mode 100644 index bf9237fe6fb3..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchyFieldUsageConflict.java +++ /dev/null @@ -1,16 +0,0 @@ -import java.util.List; -class A<E> { - E e; - List<E> list = new List<E>(); -} - -class B<T> extends A<T> {} - -class C extends B <S<caret>tring> { - void foo() { - if (e == null && list != null) { - for (String s : list) { - } - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchyFieldUsageConflict.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchyFieldUsageConflict.java.after deleted file mode 100644 index ffecf75c7f20..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/TypeHierarchyFieldUsageConflict.java.after +++ /dev/null @@ -1,16 +0,0 @@ -import java.util.List; -class A<E> { - E e; - List<E> list = new List<E>(); -} - -class B<T> extends A<T> {} - -class C extends B<Object> { - void foo() { - if (e == null && list != null) { - for (Object s : list) { - } - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/UsedInSuper.java b/plugins/typeMigration/testData/refactoring/changeTypeSignature/UsedInSuper.java deleted file mode 100644 index 4cbee666c3cb..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/UsedInSuper.java +++ /dev/null @@ -1,9 +0,0 @@ -class A<T> { - T foo(){return null;} - T bar(){return foo();} -} - -class B extends A<S<caret>tring> { - String foo(){return super.bar();} - String bar(){return super.foo();} -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/changeTypeSignature/UsedInSuper.java.after b/plugins/typeMigration/testData/refactoring/changeTypeSignature/UsedInSuper.java.after deleted file mode 100644 index d321e6520dc0..000000000000 --- a/plugins/typeMigration/testData/refactoring/changeTypeSignature/UsedInSuper.java.after +++ /dev/null @@ -1,9 +0,0 @@ -class A<T> { - T foo(){return null;} - T bar(){return foo();} -} - -class B extends A<Object> { - Object foo(){return super.bar();} - Object bar(){return super.foo();} -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccess2Lvalue/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccess2Lvalue/after/Expr.items deleted file mode 100644 index 7ce904f6afe4..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccess2Lvalue/after/Expr.items +++ /dev/null @@ -1,33 +0,0 @@ -Types: -PsiField:myForAccess : ClassParent -PsiLocalVariable:vf : ClassParent -PsiLocalVariable:vfcthis : ClassParent -PsiLocalVariable:vfnew : ClassParent -PsiLocalVariable:vfparen : ClassParent -PsiLocalVariable:vfthis : ClassParent -PsiLocalVariable:vm : ClassParent -PsiLocalVariable:vmcthis : ClassParent -PsiLocalVariable:vmnew : ClassParent -PsiLocalVariable:vmparen : ClassParent -PsiLocalVariable:vmthis : ClassParent -PsiMethod:forAccess : ClassParent -PsiMethodCallExpression:(this).forAccess() : ClassParent -PsiMethodCallExpression:Expr.this.forAccess() : ClassParent -PsiMethodCallExpression:forAccess() : ClassParent -PsiMethodCallExpression:forAccess() : ClassParent -PsiMethodCallExpression:forAccess() : ClassParent -PsiMethodCallExpression:new Expr().forAccess() : ClassParent -PsiMethodCallExpression:this.forAccess() : ClassParent -PsiReferenceExpression:(this).myForAccess : ClassParent -PsiReferenceExpression:Expr.this.myForAccess : ClassParent -PsiReferenceExpression:myForAccess : ClassParent -PsiReferenceExpression:myForAccess : ClassParent -PsiReferenceExpression:new Expr().myForAccess : ClassParent -PsiReferenceExpression:this.myForAccess : ClassParent - -Conversions: - -New expression type changes: -Fails: -forAccess()->ClassParent -forAccess()->ClassParent diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccess2Lvalue/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccess2Lvalue/after/Expr.java deleted file mode 100644 index 65fd52a3e86e..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccess2Lvalue/after/Expr.java +++ /dev/null @@ -1,35 +0,0 @@ -class ClassParent {} -class ClassChild extends ClassParent { - public void forAccess2() { - } - - public int myForAccess; -} -class ClassGrandChild extends ClassChild {} - -class Expr { - public ClassParent myForAccess; - public ClassParent forAccess() { - return myForAccess; - } - - public void methMemAcc() { - ClassParent vf = myForAccess; - ClassParent vm = forAccess(); - - ClassParent vfthis = this.myForAccess; - ClassParent vmthis = this.forAccess(); - - ClassParent vfcthis = Expr.this.myForAccess; - ClassParent vmcthis = Expr.this.forAccess(); - - ClassParent vfparen = (this).myForAccess; - ClassParent vmparen = (this).forAccess(); - - ClassParent vfnew = new Expr().myForAccess; - ClassParent vmnew = new Expr().forAccess(); - - int v = forAccess().myForAccess; - forAccess().forAccess2(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccess2Lvalue/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccess2Lvalue/before/Expr.java deleted file mode 100644 index 1c13032fa121..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccess2Lvalue/before/Expr.java +++ /dev/null @@ -1,35 +0,0 @@ -class ClassParent {} -class ClassChild extends ClassParent { - public void forAccess2() { - } - - public int myForAccess; -} -class ClassGrandChild extends ClassChild {} - -class Expr { - public ClassChild myForAccess; - public ClassChild forAccess() { - return myForAccess; - } - - public void methMemAcc() { - ClassChild vf = myForAccess; - ClassChild vm = forAccess(); - - ClassChild vfthis = this.myForAccess; - ClassChild vmthis = this.forAccess(); - - ClassChild vfcthis = Expr.this.myForAccess; - ClassChild vmcthis = Expr.this.forAccess(); - - ClassChild vfparen = (this).myForAccess; - ClassChild vmparen = (this).forAccess(); - - ClassChild vfnew = new Expr().myForAccess; - ClassChild vmnew = new Expr().forAccess(); - - int v = forAccess().myForAccess; - forAccess().forAccess2(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccess2Rvalue/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccess2Rvalue/after/Expr.items deleted file mode 100644 index d79df57fc220..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccess2Rvalue/after/Expr.items +++ /dev/null @@ -1,37 +0,0 @@ -Types: -PsiField:myField : ClassGrandChild -PsiField:myForAccess1 : ClassGrandChild -PsiField:myForAccess2 : ClassGrandChild -PsiField:myForAccess3 : ClassGrandChild -PsiField:myForAccess4 : ClassGrandChild -PsiField:myForAccess5 : ClassGrandChild -PsiMethod:forAccess1 : ClassGrandChild -PsiMethod:forAccess2 : ClassGrandChild -PsiMethod:forAccess3 : ClassGrandChild -PsiMethod:forAccess4 : ClassGrandChild -PsiMethod:forAccess5 : ClassGrandChild -PsiMethodCallExpression:(this).forAccess4() : ClassGrandChild -PsiMethodCallExpression:Expr.this.forAccess3() : ClassGrandChild -PsiMethodCallExpression:forAccess1() : ClassGrandChild -PsiMethodCallExpression:new Expr().forAccess5() : ClassGrandChild -PsiMethodCallExpression:this.forAccess2() : ClassGrandChild -PsiReferenceExpression:(this).myForAccess4 : ClassGrandChild -PsiReferenceExpression:Expr.this.myForAccess3 : ClassGrandChild -PsiReferenceExpression:myField : ClassGrandChild -PsiReferenceExpression:myField : ClassGrandChild -PsiReferenceExpression:myField : ClassGrandChild -PsiReferenceExpression:myField : ClassGrandChild -PsiReferenceExpression:myField : ClassGrandChild -PsiReferenceExpression:myField : ClassGrandChild -PsiReferenceExpression:myField : ClassGrandChild -PsiReferenceExpression:myField : ClassGrandChild -PsiReferenceExpression:myField : ClassGrandChild -PsiReferenceExpression:myField : ClassGrandChild -PsiReferenceExpression:myForAccess1 : ClassGrandChild -PsiReferenceExpression:new Expr().myForAccess5 : ClassGrandChild -PsiReferenceExpression:this.myForAccess2 : ClassGrandChild - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccess2Rvalue/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccess2Rvalue/after/Expr.java deleted file mode 100644 index 11599a2cd3a6..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccess2Rvalue/after/Expr.java +++ /dev/null @@ -1,54 +0,0 @@ -class ClassParent {} -class ClassChild extends ClassParent { - public void forAccess2() { - } - - public int myForAccess; -} -class ClassGrandChild extends ClassChild {} - -class Expr { - private ClassGrandChild myField; - - public ClassGrandChild myForAccess1; - public ClassGrandChild forAccess1() { - return null; - } - - public ClassGrandChild myForAccess2; - public ClassGrandChild forAccess2() { - return null; - } - - public ClassGrandChild myForAccess3; - public ClassGrandChild forAccess3() { - return null; - } - - public ClassGrandChild myForAccess4; - public ClassGrandChild forAccess4() { - return null; - } - - public ClassGrandChild myForAccess5; - public ClassGrandChild forAccess5() { - return null; - } - - public void methMemAcc() { - myField = myForAccess1; - myField = forAccess1(); - - myField = this.myForAccess2; - myField = this.forAccess2(); - - myField = Expr.this.myForAccess3; - myField = Expr.this.forAccess3(); - - myField = (this).myForAccess4; - myField = (this).forAccess4(); - - myField = new Expr().myForAccess5; - myField = new Expr().forAccess5(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccess2Rvalue/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccess2Rvalue/before/Expr.java deleted file mode 100644 index 64998cf198c8..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccess2Rvalue/before/Expr.java +++ /dev/null @@ -1,54 +0,0 @@ -class ClassParent {} -class ClassChild extends ClassParent { - public void forAccess2() { - } - - public int myForAccess; -} -class ClassGrandChild extends ClassChild {} - -class Expr { - private ClassChild myField; - - public ClassChild myForAccess1; - public ClassChild forAccess1() { - return null; - } - - public ClassChild myForAccess2; - public ClassChild forAccess2() { - return null; - } - - public ClassChild myForAccess3; - public ClassChild forAccess3() { - return null; - } - - public ClassChild myForAccess4; - public ClassChild forAccess4() { - return null; - } - - public ClassChild myForAccess5; - public ClassChild forAccess5() { - return null; - } - - public void methMemAcc() { - myField = myForAccess1; - myField = forAccess1(); - - myField = this.myForAccess2; - myField = this.forAccess2(); - - myField = Expr.this.myForAccess3; - myField = Expr.this.forAccess3(); - - myField = (this).myForAccess4; - myField = (this).forAccess4(); - - myField = new Expr().myForAccess5; - myField = new Expr().forAccess5(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccessParent2Lvalue/after/Ession.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccessParent2Lvalue/after/Ession.items deleted file mode 100644 index 15e80380b536..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccessParent2Lvalue/after/Ession.items +++ /dev/null @@ -1,17 +0,0 @@ -Types: -PsiField:myForSuperAccess : ClassParent -PsiLocalVariable:vfcsuper : ClassParent -PsiLocalVariable:vfsuper : ClassParent -PsiLocalVariable:vmcsuper : ClassParent -PsiLocalVariable:vmsuper : ClassParent -PsiMethod:forSuperAccess : ClassParent -PsiMethodCallExpression:Expr.super.forSuperAccess() : ClassParent -PsiMethodCallExpression:super.forSuperAccess() : ClassParent -PsiReferenceExpression:Expr.super.myForSuperAccess : ClassParent -PsiReferenceExpression:myForSuperAccess : ClassParent -PsiReferenceExpression:super.myForSuperAccess : ClassParent - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccessParent2Lvalue/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccessParent2Lvalue/after/Expr.java deleted file mode 100644 index 3a9531d8f9d8..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccessParent2Lvalue/after/Expr.java +++ /dev/null @@ -1,20 +0,0 @@ -class ClassParent {} -class ClassChild extends ClassParent {} -class ClassGrandChild extends ClassChild {} - -class Ession { - public ClassParent myForSuperAccess; - public ClassParent forSuperAccess() { - return myForSuperAccess; - } -} - -class Expr extends Ession { - public void methMemAcc() { - ClassParent vfsuper = super.myForSuperAccess; - ClassParent vmsuper = super.forSuperAccess(); - - ClassParent vfcsuper = Expr.super.myForSuperAccess; - ClassParent vmcsuper = Expr.super.forSuperAccess(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccessParent2Lvalue/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccessParent2Lvalue/before/Expr.java deleted file mode 100644 index 898b41a6ab6f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccessParent2Lvalue/before/Expr.java +++ /dev/null @@ -1,20 +0,0 @@ -class ClassParent {} -class ClassChild extends ClassParent {} -class ClassGrandChild extends ClassChild {} - -class Ession { - public ClassChild myForSuperAccess; - public ClassChild forSuperAccess() { - return myForSuperAccess; - } -} - -class Expr extends Ession { - public void methMemAcc() { - ClassChild vfsuper = super.myForSuperAccess; - ClassChild vmsuper = super.forSuperAccess(); - - ClassChild vfcsuper = Expr.super.myForSuperAccess; - ClassChild vmcsuper = Expr.super.forSuperAccess(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccessParent2Rvalue/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccessParent2Rvalue/after/Expr.items deleted file mode 100644 index 95bf149e7b68..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccessParent2Rvalue/after/Expr.items +++ /dev/null @@ -1,19 +0,0 @@ -Types: -PsiField:myField : ClassGrandChild -PsiField:myForSuperAccess1 : ClassGrandChild -PsiField:myForSuperAccess2 : ClassGrandChild -PsiMethod:forSuperAccess1 : ClassGrandChild -PsiMethod:forSuperAccess2 : ClassGrandChild -PsiMethodCallExpression:Expr.super.forSuperAccess2() : ClassGrandChild -PsiMethodCallExpression:super.forSuperAccess1() : ClassGrandChild -PsiReferenceExpression:Expr.super.myForSuperAccess2 : ClassGrandChild -PsiReferenceExpression:myField : ClassGrandChild -PsiReferenceExpression:myField : ClassGrandChild -PsiReferenceExpression:myField : ClassGrandChild -PsiReferenceExpression:myField : ClassGrandChild -PsiReferenceExpression:super.myForSuperAccess1 : ClassGrandChild - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccessParent2Rvalue/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccessParent2Rvalue/after/Expr.java deleted file mode 100644 index 9ffe2e3a7332..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccessParent2Rvalue/after/Expr.java +++ /dev/null @@ -1,26 +0,0 @@ -class ClassParent {} -class ClassChild extends ClassParent {} -class ClassGrandChild extends ClassChild {} - -class Ession { - public ClassGrandChild myForSuperAccess1; - public ClassGrandChild forSuperAccess1() { - return null; - } - - public ClassGrandChild myForSuperAccess2; - public ClassGrandChild forSuperAccess2() { - return null; - } -} - -class Expr extends Ession { - private ClassGrandChild myField; - public void methMemAcc() { - myField = super.myForSuperAccess1; - myField = super.forSuperAccess1(); - - myField = Expr.super.myForSuperAccess2; - myField = Expr.super.forSuperAccess2(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccessParent2Rvalue/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccessParent2Rvalue/before/Expr.java deleted file mode 100644 index 0a244c6448bd..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprAccessParent2Rvalue/before/Expr.java +++ /dev/null @@ -1,26 +0,0 @@ -class ClassParent {} -class ClassChild extends ClassParent {} -class ClassGrandChild extends ClassChild {} - -class Ession { - public ClassChild myForSuperAccess1; - public ClassChild forSuperAccess1() { - return null; - } - - public ClassChild myForSuperAccess2; - public ClassChild forSuperAccess2() { - return null; - } -} - -class Expr extends Ession { - private ClassChild myField; - public void methMemAcc() { - myField = super.myForSuperAccess1; - myField = super.forSuperAccess1(); - - myField = Expr.super.myForSuperAccess2; - myField = Expr.super.forSuperAccess2(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprArrayAccessNegative/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprArrayAccessNegative/after/Expr.items deleted file mode 100644 index 0f10ca83564b..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprArrayAccessNegative/after/Expr.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:p : double -PsiReferenceExpression:p : double - -Conversions: - -New expression type changes: -Fails: -p->double diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprArrayAccessNegative/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprArrayAccessNegative/after/Expr.java deleted file mode 100644 index 9258f512d2b1..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprArrayAccessNegative/after/Expr.java +++ /dev/null @@ -1,6 +0,0 @@ -class Expr { - public void meth(double p) { - String[] sa = new String[]{"0", "1"}; - String s = sa[p]; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprArrayAccessNegative/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprArrayAccessNegative/before/Expr.java deleted file mode 100644 index 57fde1c6b34c..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprArrayAccessNegative/before/Expr.java +++ /dev/null @@ -1,6 +0,0 @@ -class Expr { - public void meth(int p) { - String[] sa = new String[]{"0", "1"}; - String s = sa[p]; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprArrayAccessPositive/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprArrayAccessPositive/after/Expr.items deleted file mode 100644 index afc565fc6df7..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprArrayAccessPositive/after/Expr.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiParameter:p : char -PsiReferenceExpression:p : char - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprArrayAccessPositive/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprArrayAccessPositive/after/Expr.java deleted file mode 100644 index 7971b5e9e770..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprArrayAccessPositive/after/Expr.java +++ /dev/null @@ -1,6 +0,0 @@ -class Expr { - public void meth(char p) { - String[] sa = new String[]{"0", "1"}; - String s = sa[p]; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprArrayAccessPositive/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprArrayAccessPositive/before/Expr.java deleted file mode 100644 index 57fde1c6b34c..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprArrayAccessPositive/before/Expr.java +++ /dev/null @@ -1,6 +0,0 @@ -class Expr { - public void meth(int p) { - String[] sa = new String[]{"0", "1"}; - String s = sa[p]; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanBoolean/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanBoolean/after/Expr.items deleted file mode 100644 index 4e6bf57cbb3e..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanBoolean/after/Expr.items +++ /dev/null @@ -1,30 +0,0 @@ -Types: -PsiLocalVariable:vba : int -PsiLocalVariable:vbb : int -PsiLocalVariable:vbc : int -PsiParameter:pb : int -PsiReferenceExpression:pb : int -PsiReferenceExpression:pb : int -PsiReferenceExpression:pb : int -PsiReferenceExpression:pb : int -PsiReferenceExpression:pb : int -PsiReferenceExpression:pb : int -PsiReferenceExpression:pb : int -PsiReferenceExpression:pb : int -PsiReferenceExpression:pb : int -PsiReferenceExpression:pb : int -PsiReferenceExpression:pb : int -PsiReferenceExpression:pb : int -PsiReferenceExpression:pb : int - -Conversions: - -New expression type changes: -Fails: -pb->int -pb->int -pb->int -pb->int -pb->int -pb->int -pb->int diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanBoolean/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanBoolean/after/Expr.java deleted file mode 100644 index d0dd0e83a559..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanBoolean/after/Expr.java +++ /dev/null @@ -1,16 +0,0 @@ -class Expr { - public void meth(int pb) { - int vba = pb & pb; - int vbb = pb ^ pb; - int vbc = pb | pb; - boolean vbd = pb && pb; - boolean vbe = pb || pb; - - boolean vn1 = false; - vn1 &= pb; - boolean vn2 = false; - vn2 ^= pb; - boolean vn3 = false; - vn3 |= pb; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanBoolean/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanBoolean/before/Expr.java deleted file mode 100644 index d0364a40ca25..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanBoolean/before/Expr.java +++ /dev/null @@ -1,16 +0,0 @@ -class Expr { - public void meth(boolean pb) { - boolean vba = pb & pb; - boolean vbb = pb ^ pb; - boolean vbc = pb | pb; - boolean vbd = pb && pb; - boolean vbe = pb || pb; - - boolean vn1 = false; - vn1 &= pb; - boolean vn2 = false; - vn2 ^= pb; - boolean vn3 = false; - vn3 |= pb; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanNumeric/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanNumeric/after/Expr.items deleted file mode 100644 index 21ecfb0d65a5..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanNumeric/after/Expr.items +++ /dev/null @@ -1,19 +0,0 @@ -Types: -PsiParameter:pi : java.lang.Object -PsiReferenceExpression:pi : java.lang.Object -PsiReferenceExpression:pi : java.lang.Object -PsiReferenceExpression:pi : java.lang.Object -PsiReferenceExpression:pi : java.lang.Object -PsiReferenceExpression:pi : java.lang.Object -PsiReferenceExpression:pi : java.lang.Object - -Conversions: - -New expression type changes: -Fails: -pi->java.lang.Object -pi->java.lang.Object -pi->java.lang.Object -pi->java.lang.Object -pi->java.lang.Object -pi->java.lang.Object diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanNumeric/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanNumeric/after/Expr.java deleted file mode 100644 index c54d809c3906..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanNumeric/after/Expr.java +++ /dev/null @@ -1,10 +0,0 @@ -class Expr { - public void meth(Object pi) { - boolean vb1 = pi > 0; - boolean vb2 = pi >= 0; - boolean vb3 = pi < 0; - boolean vb4 = pi <= 0; - boolean vb6 = pi == 0; - boolean vb7 = pi != 0; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanNumeric/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanNumeric/before/Expr.java deleted file mode 100644 index 1b113b43a3e6..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanNumeric/before/Expr.java +++ /dev/null @@ -1,10 +0,0 @@ -class Expr { - public void meth(int pi) { - boolean vb1 = pi > 0; - boolean vb2 = pi >= 0; - boolean vb3 = pi < 0; - boolean vb4 = pi <= 0; - boolean vb6 = pi == 0; - boolean vb7 = pi != 0; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanReference/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanReference/after/Expr.items deleted file mode 100644 index 815d62ca7530..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanReference/after/Expr.items +++ /dev/null @@ -1,15 +0,0 @@ -Types: -PsiParameter:ps : double -PsiReferenceExpression:ps : double -PsiReferenceExpression:ps : double -PsiReferenceExpression:ps : double -PsiReferenceExpression:ps : double - -Conversions: - -New expression type changes: -Fails: -ps->double -ps->double -ps->double -ps->double diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanReference/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanReference/after/Expr.java deleted file mode 100644 index bc4c04967759..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanReference/after/Expr.java +++ /dev/null @@ -1,8 +0,0 @@ -class Expr { - public void meth(double ps) { - boolean vb5 = ps instanceof CharSequence; - boolean vb8 = ps == "string"; - boolean vb9 = ps != "string"; - boolean vbf = (1 >= 0) && (ps instanceof CharSequence); - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanReference/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanReference/before/Expr.java deleted file mode 100644 index 6def87eb9709..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcBooleanReference/before/Expr.java +++ /dev/null @@ -1,8 +0,0 @@ -class Expr { - public void meth(String ps) { - boolean vb5 = ps instanceof CharSequence; - boolean vb8 = ps == "string"; - boolean vb9 = ps != "string"; - boolean vbf = (1 >= 0) && (ps instanceof CharSequence); - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Boolean/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Boolean/after/Expr.items deleted file mode 100644 index aeddc71515d9..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Boolean/after/Expr.items +++ /dev/null @@ -1,58 +0,0 @@ -Types: -PsiLocalVariable:vb9 : boolean -PsiLocalVariable:vba : boolean -PsiLocalVariable:vbb : boolean -PsiParameter:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean -PsiReferenceExpression:p : boolean - -Conversions: - -New expression type changes: -Fails: -p->boolean -p->boolean -p->boolean -p->boolean -p->boolean -p->boolean -p->boolean -p->boolean -p->boolean -p->boolean -p->boolean -p->boolean -p->boolean -p->boolean -p->boolean -p->boolean -p->boolean -p->boolean -p->boolean -p->boolean -p->boolean diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Boolean/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Boolean/after/Expr.java deleted file mode 100644 index c90c55120370..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Boolean/after/Expr.java +++ /dev/null @@ -1,35 +0,0 @@ -class Expr { - public void meth(boolean p) { - int vb1 = p * p; - int vb2 = p / p; - int vb3 = p % p; - int vb4 = p + p; - int vb5 = p - p; - boolean vb9 = p & p; - boolean vba = p ^ p; - boolean vbb = p | p; - - int vn1 = 0; - vn1 *= p; - int vn2 = 0; - vn2 /= p; - int vn3 = 0; - vn3 %= p; - int vn4 = 0; - vn4 += p; - int vn5 = 0; - vn5 -= p; - int vn6 = 0; - vn6 <<= p; - int vn7 = 0; - vn7 >>= p; - int vn8 = 0; - vn8 >>>= p; - int vn9 = 0; - vn9 &= p; - int vna = 0; - vna ^= p; - int vnb = 0; - vnb |= p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Boolean/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Boolean/before/Expr.java deleted file mode 100644 index 057b284248a0..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Boolean/before/Expr.java +++ /dev/null @@ -1,35 +0,0 @@ -class Expr { - public void meth(int p) { - int vb1 = p * p; - int vb2 = p / p; - int vb3 = p % p; - int vb4 = p + p; - int vb5 = p - p; - int vb9 = p & p; - int vba = p ^ p; - int vbb = p | p; - - int vn1 = 0; - vn1 *= p; - int vn2 = 0; - vn2 /= p; - int vn3 = 0; - vn3 %= p; - int vn4 = 0; - vn4 += p; - int vn5 = 0; - vn5 -= p; - int vn6 = 0; - vn6 <<= p; - int vn7 = 0; - vn7 >>= p; - int vn8 = 0; - vn8 >>>= p; - int vn9 = 0; - vn9 &= p; - int vna = 0; - vna ^= p; - int vnb = 0; - vnb |= p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Floating/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Floating/after/Expr.items deleted file mode 100644 index 0fdb9d1291e9..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Floating/after/Expr.items +++ /dev/null @@ -1,78 +0,0 @@ -Types: -PsiLocalVariable:vb1 : float -PsiLocalVariable:vb2 : float -PsiLocalVariable:vb3 : float -PsiLocalVariable:vb4 : float -PsiLocalVariable:vb5 : float -PsiLocalVariable:vn1 : float -PsiLocalVariable:vn2 : float -PsiLocalVariable:vn3 : float -PsiLocalVariable:vn4 : float -PsiLocalVariable:vn5 : float -PsiLocalVariable:vu1 : float -PsiLocalVariable:vu2 : float -PsiLocalVariable:vu3 : float -PsiLocalVariable:vu4 : float -PsiLocalVariable:vu5 : float -PsiLocalVariable:vu6 : float -PsiParameter:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:vn1 : float -PsiReferenceExpression:vn2 : float -PsiReferenceExpression:vn3 : float -PsiReferenceExpression:vn4 : float -PsiReferenceExpression:vn5 : float - -Conversions: -0 -> $ -0 -> $ -0 -> $ -0 -> $ -0 -> $ - -New expression type changes: -Fails: -p->float -p->float -p->float -p->float -p->float -p->float -p->float -p->float -p->float -p->float -p->float -p->float diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Floating/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Floating/after/Expr.java deleted file mode 100644 index 8e16d5b5d974..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Floating/after/Expr.java +++ /dev/null @@ -1,42 +0,0 @@ -class Expr { - public void meth(float p) { - float vu1 = p++; - float vu2 = p--; - float vu3 = ++p; - float vu4 = --p; - float vu5 = -p; - float vu6 = +p; - - float vb1 = p * p; - float vb2 = p / p; - float vb3 = p % p; - float vb4 = p + p; - float vb5 = p - p; - int vb9 = p & p; - int vba = p ^ p; - int vbb = p | p; - - float vn1 = 0; - vn1 *= p; - float vn2 = 0; - vn2 /= p; - float vn3 = 0; - vn3 %= p; - float vn4 = 0; - vn4 += p; - float vn5 = 0; - vn5 -= p; - int vn6 = 0; - vn6 <<= p; - int vn7 = 0; - vn7 >>= p; - int vn8 = 0; - vn8 >>>= p; - int vn9 = 0; - vn9 &= p; - int vna = 0; - vna ^= p; - int vnb = 0; - vnb |= p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Floating/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Floating/before/Expr.java deleted file mode 100644 index 4088b28a0060..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Floating/before/Expr.java +++ /dev/null @@ -1,42 +0,0 @@ -class Expr { - public void meth(int p) { - int vu1 = p++; - int vu2 = p--; - int vu3 = ++p; - int vu4 = --p; - int vu5 = -p; - int vu6 = +p; - - int vb1 = p * p; - int vb2 = p / p; - int vb3 = p % p; - int vb4 = p + p; - int vb5 = p - p; - int vb9 = p & p; - int vba = p ^ p; - int vbb = p | p; - - int vn1 = 0; - vn1 *= p; - int vn2 = 0; - vn2 /= p; - int vn3 = 0; - vn3 %= p; - int vn4 = 0; - vn4 += p; - int vn5 = 0; - vn5 -= p; - int vn6 = 0; - vn6 <<= p; - int vn7 = 0; - vn7 >>= p; - int vn8 = 0; - vn8 >>>= p; - int vn9 = 0; - vn9 &= p; - int vna = 0; - vna ^= p; - int vnb = 0; - vnb |= p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Int/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Int/after/Expr.items deleted file mode 100644 index 36e79ff677b4..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Int/after/Expr.items +++ /dev/null @@ -1,98 +0,0 @@ -Types: -PsiLocalVariable:vb1 : long -PsiLocalVariable:vb2 : long -PsiLocalVariable:vb3 : long -PsiLocalVariable:vb4 : long -PsiLocalVariable:vb5 : long -PsiLocalVariable:vb6 : long -PsiLocalVariable:vb7 : long -PsiLocalVariable:vb8 : long -PsiLocalVariable:vb9 : long -PsiLocalVariable:vba : long -PsiLocalVariable:vbb : long -PsiLocalVariable:vn1 : long -PsiLocalVariable:vn2 : long -PsiLocalVariable:vn3 : long -PsiLocalVariable:vn4 : long -PsiLocalVariable:vn5 : long -PsiLocalVariable:vn6 : long -PsiLocalVariable:vn7 : long -PsiLocalVariable:vn8 : long -PsiLocalVariable:vn9 : long -PsiLocalVariable:vna : long -PsiLocalVariable:vnb : long -PsiLocalVariable:vu1 : long -PsiLocalVariable:vu2 : long -PsiLocalVariable:vu3 : long -PsiLocalVariable:vu4 : long -PsiLocalVariable:vu5 : long -PsiLocalVariable:vu6 : long -PsiLocalVariable:vu7 : long -PsiParameter:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:vn1 : long -PsiReferenceExpression:vn2 : long -PsiReferenceExpression:vn3 : long -PsiReferenceExpression:vn4 : long -PsiReferenceExpression:vn5 : long -PsiReferenceExpression:vn6 : long -PsiReferenceExpression:vn7 : long -PsiReferenceExpression:vn8 : long -PsiReferenceExpression:vn9 : long -PsiReferenceExpression:vna : long -PsiReferenceExpression:vnb : long - -Conversions: -0 -> $ -0 -> $ -0 -> $ -0 -> $ -0 -> $ -0 -> $ -0 -> $ -0 -> $ -0 -> $ -0 -> $ -0 -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Int/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Int/after/Expr.java deleted file mode 100644 index 323dad23d5d3..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Int/after/Expr.java +++ /dev/null @@ -1,46 +0,0 @@ -class Expr { - public void meth(long p) { - long vu1 = p++; - long vu2 = p--; - long vu3 = ++p; - long vu4 = --p; - long vu5 = -p; - long vu6 = +p; - long vu7 = ~p; - - long vb1 = p * p; - long vb2 = p / p; - long vb3 = p % p; - long vb4 = p + p; - long vb5 = p - p; - long vb6 = p << p; - long vb7 = p >> p; - long vb8 = p >>> p; - long vb9 = p & p; - long vba = p ^ p; - long vbb = p | p; - - long vn1 = 0; - vn1 *= p; - long vn2 = 0; - vn2 /= p; - long vn3 = 0; - vn3 %= p; - long vn4 = 0; - vn4 += p; - long vn5 = 0; - vn5 -= p; - long vn6 = 0; - vn6 <<= p; - long vn7 = 0; - vn7 >>= p; - long vn8 = 0; - vn8 >>>= p; - long vn9 = 0; - vn9 &= p; - long vna = 0; - vna ^= p; - long vnb = 0; - vnb |= p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Int/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Int/before/Expr.java deleted file mode 100644 index 716f4b7e60e1..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2Int/before/Expr.java +++ /dev/null @@ -1,46 +0,0 @@ -class Expr { - public void meth(int p) { - int vu1 = p++; - int vu2 = p--; - int vu3 = ++p; - int vu4 = --p; - int vu5 = -p; - int vu6 = +p; - int vu7 = ~p; - - int vb1 = p * p; - int vb2 = p / p; - int vb3 = p % p; - int vb4 = p + p; - int vb5 = p - p; - int vb6 = p << p; - int vb7 = p >> p; - int vb8 = p >>> p; - int vb9 = p & p; - int vba = p ^ p; - int vbb = p | p; - - int vn1 = 0; - vn1 *= p; - int vn2 = 0; - vn2 /= p; - int vn3 = 0; - vn3 %= p; - int vn4 = 0; - vn4 += p; - int vn5 = 0; - vn5 -= p; - int vn6 = 0; - vn6 <<= p; - int vn7 = 0; - vn7 >>= p; - int vn8 = 0; - vn8 >>>= p; - int vn9 = 0; - vn9 &= p; - int vna = 0; - vna ^= p; - int vnb = 0; - vnb |= p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2String/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2String/after/Expr.items deleted file mode 100644 index 406008949bd1..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2String/after/Expr.items +++ /dev/null @@ -1,62 +0,0 @@ -Types: -PsiLocalVariable:vb4 : java.lang.String -PsiLocalVariable:vn4 : java.lang.String -PsiParameter:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:vn4 : java.lang.String - -Conversions: - -New expression type changes: -Fails: -0->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String -p->java.lang.String diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2String/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2String/after/Expr.java deleted file mode 100644 index 62fd2ff0b0ff..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2String/after/Expr.java +++ /dev/null @@ -1,35 +0,0 @@ -class Expr { - public void meth(String p) { - int vb1 = p * p; - int vb2 = p / p; - int vb3 = p % p; - String vb4 = p + p; - int vb5 = p - p; - int vb9 = p & p; - int vba = p ^ p; - int vbb = p | p; - - int vn1 = 0; - vn1 *= p; - int vn2 = 0; - vn2 /= p; - int vn3 = 0; - vn3 %= p; - String vn4 = 0; - vn4 += p; - int vn5 = 0; - vn5 -= p; - int vn6 = 0; - vn6 <<= p; - int vn7 = 0; - vn7 >>= p; - int vn8 = 0; - vn8 >>>= p; - int vn9 = 0; - vn9 &= p; - int vna = 0; - vna ^= p; - int vnb = 0; - vnb |= p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2String/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2String/before/Expr.java deleted file mode 100644 index 057b284248a0..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCalcNumeric2String/before/Expr.java +++ /dev/null @@ -1,35 +0,0 @@ -class Expr { - public void meth(int p) { - int vb1 = p * p; - int vb2 = p / p; - int vb3 = p % p; - int vb4 = p + p; - int vb5 = p - p; - int vb9 = p & p; - int vba = p ^ p; - int vbb = p | p; - - int vn1 = 0; - vn1 *= p; - int vn2 = 0; - vn2 /= p; - int vn3 = 0; - vn3 %= p; - int vn4 = 0; - vn4 += p; - int vn5 = 0; - vn5 -= p; - int vn6 = 0; - vn6 <<= p; - int vn7 = 0; - vn7 >>= p; - int vn8 = 0; - vn8 >>>= p; - int vn9 = 0; - vn9 &= p; - int vna = 0; - vna ^= p; - int vnb = 0; - vnb |= p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCast2LvalueNeg/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCast2LvalueNeg/after/Expr.items deleted file mode 100644 index 01f325b2852d..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCast2LvalueNeg/after/Expr.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:p : java.lang.String -PsiReferenceExpression:p : java.lang.String - -Conversions: - -New expression type changes: -Fails: -(short) p->java.lang.String diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCast2LvalueNeg/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCast2LvalueNeg/after/Expr.java deleted file mode 100644 index 5a7343152288..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCast2LvalueNeg/after/Expr.java +++ /dev/null @@ -1,5 +0,0 @@ -class Expr { - public void meth(String p) { - short v = (short) p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCast2LvalueNeg/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCast2LvalueNeg/before/Expr.java deleted file mode 100644 index e3519b4bb4bf..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCast2LvalueNeg/before/Expr.java +++ /dev/null @@ -1,5 +0,0 @@ -class Expr { - public void meth(byte p) { - short v = (short) p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCast2LvaluePos/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCast2LvaluePos/after/Expr.items deleted file mode 100644 index f69d09024863..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCast2LvaluePos/after/Expr.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiParameter:p : int -PsiReferenceExpression:p : int - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCast2LvaluePos/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCast2LvaluePos/after/Expr.java deleted file mode 100644 index 64aecc896b80..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCast2LvaluePos/after/Expr.java +++ /dev/null @@ -1,5 +0,0 @@ -class Expr { - public void meth(int p) { - short v = (short) p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCast2LvaluePos/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCast2LvaluePos/before/Expr.java deleted file mode 100644 index e3519b4bb4bf..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprCast2LvaluePos/before/Expr.java +++ /dev/null @@ -1,5 +0,0 @@ -class Expr { - public void meth(byte p) { - short v = (short) p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2Reference/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2Reference/after/Expr.items deleted file mode 100644 index 0b73994dece5..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2Reference/after/Expr.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:pns : java.lang.Object -PsiReferenceExpression:pns : java.lang.Object -PsiReferenceExpression:pns : java.lang.Object - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2Reference/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2Reference/after/Expr.java deleted file mode 100644 index cf844f4eddf2..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2Reference/after/Expr.java +++ /dev/null @@ -1,9 +0,0 @@ -class Expr { - private String myString; - public void meth(Object pns, String ps) { - myString = ps + ps; - myString = ps + pns; - myString = pns + ps; - myString += ps; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2Reference/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2Reference/before/Expr.java deleted file mode 100644 index 71b89f955e59..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2Reference/before/Expr.java +++ /dev/null @@ -1,9 +0,0 @@ -class Expr { - private String myString; - public void meth(int pns, String ps) { - myString = ps + ps; - myString = ps + pns; - myString = pns + ps; - myString += ps; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2String/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2String/after/Expr.items deleted file mode 100644 index 46d6b1f5a15f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2String/after/Expr.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:pns : java.lang.String -PsiReferenceExpression:pns : java.lang.String -PsiReferenceExpression:pns : java.lang.String - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2String/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2String/after/Expr.java deleted file mode 100644 index 5ce2b795d268..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2String/after/Expr.java +++ /dev/null @@ -1,9 +0,0 @@ -class Expr { - private String myString; - public void meth(String pns, String ps) { - myString = ps + ps; - myString = ps + pns; - myString = pns + ps; - myString += ps; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2String/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2String/before/Expr.java deleted file mode 100644 index 71b89f955e59..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2String/before/Expr.java +++ /dev/null @@ -1,9 +0,0 @@ -class Expr { - private String myString; - public void meth(int pns, String ps) { - myString = ps + ps; - myString = ps + pns; - myString = pns + ps; - myString += ps; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatString2Numeric/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatString2Numeric/after/Expr.items deleted file mode 100644 index 3bb9c1ebf19a..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatString2Numeric/after/Expr.items +++ /dev/null @@ -1,17 +0,0 @@ -Types: -PsiField:myString : int -PsiParameter:ps : int -PsiReferenceExpression:myString : int -PsiReferenceExpression:myString : int -PsiReferenceExpression:myString : int -PsiReferenceExpression:myString : int -PsiReferenceExpression:ps : int -PsiReferenceExpression:ps : int -PsiReferenceExpression:ps : int -PsiReferenceExpression:ps : int -PsiReferenceExpression:ps : int - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatString2Numeric/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatString2Numeric/after/Expr.java deleted file mode 100644 index ac05959f3c08..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatString2Numeric/after/Expr.java +++ /dev/null @@ -1,9 +0,0 @@ -class Expr { - private int myString; - public void meth(int ps, int pns) { - myString = ps + ps; - myString = ps + pns; - myString = pns + ps; - myString += ps; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatString2Numeric/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatString2Numeric/before/Expr.java deleted file mode 100644 index bb57398b961c..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatString2Numeric/before/Expr.java +++ /dev/null @@ -1,9 +0,0 @@ -class Expr { - private String myString; - public void meth(String ps, int pns) { - myString = ps + ps; - myString = ps + pns; - myString = pns + ps; - myString += ps; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatString2Reference/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatString2Reference/after/Expr.items deleted file mode 100644 index 302e3c9da48c..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatString2Reference/after/Expr.items +++ /dev/null @@ -1,23 +0,0 @@ -Types: -PsiField:myString : int -PsiParameter:ps : java.lang.Object -PsiReferenceExpression:myString : int -PsiReferenceExpression:myString : int -PsiReferenceExpression:myString : int -PsiReferenceExpression:myString : int -PsiReferenceExpression:ps : java.lang.Object -PsiReferenceExpression:ps : java.lang.Object -PsiReferenceExpression:ps : java.lang.Object -PsiReferenceExpression:ps : java.lang.Object -PsiReferenceExpression:ps : java.lang.Object - -Conversions: - -New expression type changes: -Fails: -myString->int -ps->java.lang.Object -ps->java.lang.Object -ps->java.lang.Object -ps->java.lang.Object -ps->java.lang.Object diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatString2Reference/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatString2Reference/after/Expr.java deleted file mode 100644 index c23893bd5b63..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatString2Reference/after/Expr.java +++ /dev/null @@ -1,9 +0,0 @@ -class Expr { - private int myString; - public void meth(Object ps, int pns) { - myString = ps + ps; - myString = ps + pns; - myString = pns + ps; - myString += ps; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatString2Reference/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatString2Reference/before/Expr.java deleted file mode 100644 index bb57398b961c..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatString2Reference/before/Expr.java +++ /dev/null @@ -1,9 +0,0 @@ -class Expr { - private String myString; - public void meth(String ps, int pns) { - myString = ps + ps; - myString = ps + pns; - myString = pns + ps; - myString += ps; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprInstanceofNeg/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprInstanceofNeg/after/Expr.items deleted file mode 100644 index 7712b490ec9a..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprInstanceofNeg/after/Expr.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:p : java.util.List -PsiReferenceExpression:p : java.util.List - -Conversions: - -New expression type changes: -Fails: -p->java.util.List diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprInstanceofNeg/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprInstanceofNeg/after/Expr.java deleted file mode 100644 index 93da179e0c37..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprInstanceofNeg/after/Expr.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -class Expr { - public void meth(List p) { - boolean b = p instanceof HashSet; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprInstanceofNeg/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprInstanceofNeg/before/Expr.java deleted file mode 100644 index 72af0a04ab0b..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprInstanceofNeg/before/Expr.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -class Expr { - public void meth(Set p) { - boolean b = p instanceof HashSet; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprInstanceofPos/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprInstanceofPos/after/Expr.items deleted file mode 100644 index 5b608c5c0b1a..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprInstanceofPos/after/Expr.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiParameter:p : java.util.AbstractMap -PsiReferenceExpression:p : java.util.AbstractMap - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprInstanceofPos/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprInstanceofPos/after/Expr.java deleted file mode 100644 index e7f8a225bd9e..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprInstanceofPos/after/Expr.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.AbstractMap; -import java.util.HashMap; -import java.util.Map; - -class Expr { - public void meth(AbstractMap p) { - boolean b = p instanceof HashMap; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprInstanceofPos/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprInstanceofPos/before/Expr.java deleted file mode 100644 index fa8ab953a084..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprInstanceofPos/before/Expr.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.AbstractMap; -import java.util.HashMap; -import java.util.Map; - -class Expr { - public void meth(Map p) { - boolean b = p instanceof HashMap; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralBoolean/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralBoolean/after/Expr.items deleted file mode 100644 index b446d1101a06..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralBoolean/after/Expr.items +++ /dev/null @@ -1,35 +0,0 @@ -Types: -PsiField:myField : boolean -PsiReferenceExpression:myField : boolean -PsiReferenceExpression:myField : boolean -PsiReferenceExpression:myField : boolean -PsiReferenceExpression:myField : boolean -PsiReferenceExpression:myField : boolean -PsiReferenceExpression:myField : boolean -PsiReferenceExpression:myField : boolean -PsiReferenceExpression:myField : boolean -PsiReferenceExpression:myField : boolean -PsiReferenceExpression:myField : boolean -PsiReferenceExpression:myField : boolean -PsiReferenceExpression:myField : boolean -PsiReferenceExpression:myField : boolean -PsiReferenceExpression:myField : boolean -PsiReferenceExpression:myField : boolean - -Conversions: - -New expression type changes: -Fails: -"#"->boolean -'#'->boolean -043->boolean -043F->boolean -043L->boolean -0x23->boolean -0x23F->boolean -0x23L->boolean -35->boolean -35.0->boolean -35F->boolean -35L->boolean -null->boolean diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralBoolean/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralBoolean/after/Expr.java deleted file mode 100644 index d0d0a2d12326..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralBoolean/after/Expr.java +++ /dev/null @@ -1,27 +0,0 @@ -class Expr { - private boolean myField; - public void meth() { - myField = null; - - myField = false; - myField = true; - - myField = 043; - myField = 35; - myField = 0x23; - - myField = '#'; - - myField = 043L; - myField = 35L; - myField = 0x23L; - - myField = 043F; - myField = 35F; - myField = 0x23F; - - myField = 35.0; - - myField = "#"; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralBoolean/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralBoolean/before/Expr.java deleted file mode 100644 index 05b89dc47d4f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralBoolean/before/Expr.java +++ /dev/null @@ -1,27 +0,0 @@ -class Expr { - private Object myField; - public void meth() { - myField = null; - - myField = false; - myField = true; - - myField = 043; - myField = 35; - myField = 0x23; - - myField = '#'; - - myField = 043L; - myField = 35L; - myField = 0x23L; - - myField = 043F; - myField = 35F; - myField = 0x23F; - - myField = 35.0; - - myField = "#"; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralByte/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralByte/after/Expr.items deleted file mode 100644 index efc0c3bb0c41..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralByte/after/Expr.items +++ /dev/null @@ -1,37 +0,0 @@ -Types: -PsiField:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte - -Conversions: - -New expression type changes: -Fails: -"#"->byte -'#'->byte -043->byte -043F->byte -043L->byte -0x23->byte -0x23F->byte -0x23L->byte -35->byte -35.0->byte -35F->byte -35L->byte -false->byte -null->byte -true->byte diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralByte/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralByte/after/Expr.java deleted file mode 100644 index 6288f06f450a..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralByte/after/Expr.java +++ /dev/null @@ -1,27 +0,0 @@ -class Expr { - private byte myField; - public void meth() { - myField = null; - - myField = false; - myField = true; - - myField = 043; - myField = 35; - myField = 0x23; - - myField = '#'; - - myField = 043L; - myField = 35L; - myField = 0x23L; - - myField = 043F; - myField = 35F; - myField = 0x23F; - - myField = 35.0; - - myField = "#"; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralByte/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralByte/before/Expr.java deleted file mode 100644 index 05b89dc47d4f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralByte/before/Expr.java +++ /dev/null @@ -1,27 +0,0 @@ -class Expr { - private Object myField; - public void meth() { - myField = null; - - myField = false; - myField = true; - - myField = 043; - myField = 35; - myField = 0x23; - - myField = '#'; - - myField = 043L; - myField = 35L; - myField = 0x23L; - - myField = 043F; - myField = 35F; - myField = 0x23F; - - myField = 35.0; - - myField = "#"; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralChar/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralChar/after/Expr.items deleted file mode 100644 index 62960ffeacf8..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralChar/after/Expr.items +++ /dev/null @@ -1,36 +0,0 @@ -Types: -PsiField:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char - -Conversions: - -New expression type changes: -Fails: -"#"->char -043->char -043F->char -043L->char -0x23->char -0x23F->char -0x23L->char -35->char -35.0->char -35F->char -35L->char -false->char -null->char -true->char diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralChar/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralChar/after/Expr.java deleted file mode 100644 index eab5b7cf5059..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralChar/after/Expr.java +++ /dev/null @@ -1,27 +0,0 @@ -class Expr { - private char myField; - public void meth() { - myField = null; - - myField = false; - myField = true; - - myField = 043; - myField = 35; - myField = 0x23; - - myField = '#'; - - myField = 043L; - myField = 35L; - myField = 0x23L; - - myField = 043F; - myField = 35F; - myField = 0x23F; - - myField = 35.0; - - myField = "#"; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralChar/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralChar/before/Expr.java deleted file mode 100644 index 05b89dc47d4f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralChar/before/Expr.java +++ /dev/null @@ -1,27 +0,0 @@ -class Expr { - private Object myField; - public void meth() { - myField = null; - - myField = false; - myField = true; - - myField = 043; - myField = 35; - myField = 0x23; - - myField = '#'; - - myField = 043L; - myField = 35L; - myField = 0x23L; - - myField = 043F; - myField = 35F; - myField = 0x23F; - - myField = 35.0; - - myField = "#"; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassExtends/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassExtends/after/Expr.items deleted file mode 100644 index 2a1f903ca5ab..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassExtends/after/Expr.items +++ /dev/null @@ -1,17 +0,0 @@ -Types: -PsiField:myField : java.lang.Class<? extends java.util.Collection[]> -PsiReferenceExpression:myField : java.lang.Class<? extends java.util.Collection[]> -PsiReferenceExpression:myField : java.lang.Class<? extends java.util.Collection[]> -PsiReferenceExpression:myField : java.lang.Class<? extends java.util.Collection[]> -PsiReferenceExpression:myField : java.lang.Class<? extends java.util.Collection[]> -PsiReferenceExpression:myField : java.lang.Class<? extends java.util.Collection[]> - -Conversions: -Set[].class -> $ - -New expression type changes: -Fails: -Set.class->java.lang.Class<? extends java.util.Collection[]> -int.class->java.lang.Class<? extends java.util.Collection[]> -int[].class->java.lang.Class<? extends java.util.Collection[]> -void.class->java.lang.Class<? extends java.util.Collection[]> diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassExtends/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassExtends/after/Expr.java deleted file mode 100644 index a9f761e2bd1f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassExtends/after/Expr.java +++ /dev/null @@ -1,13 +0,0 @@ -import java.util.Collection; -import java.util.Set; - -class Expr { - private Class<? extends Collection[]> myField; - public void meth() { - myField = int.class; - myField = int[].class; - myField = Set.class; - myField = Set[].class; - myField = void.class; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassExtends/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassExtends/before/Expr.java deleted file mode 100644 index 202ef9ef2da6..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassExtends/before/Expr.java +++ /dev/null @@ -1,13 +0,0 @@ -import java.util.Collection; -import java.util.Set; - -class Expr { - private Object myField; - public void meth() { - myField = int.class; - myField = int[].class; - myField = Set.class; - myField = Set[].class; - myField = void.class; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassPrimitive/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassPrimitive/after/Expr.items deleted file mode 100644 index 485a0f5d91a4..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassPrimitive/after/Expr.items +++ /dev/null @@ -1,16 +0,0 @@ -Types: -PsiField:myField : java.lang.Class<java.lang.Integer> -PsiReferenceExpression:myField : java.lang.Class<java.lang.Integer> -PsiReferenceExpression:myField : java.lang.Class<java.lang.Integer> -PsiReferenceExpression:myField : java.lang.Class<java.lang.Integer> -PsiReferenceExpression:myField : java.lang.Class<java.lang.Integer> -PsiReferenceExpression:myField : java.lang.Class<java.lang.Integer> - -Conversions: - -New expression type changes: -Fails: -Set.class->java.lang.Class<java.lang.Integer> -Set[].class->java.lang.Class<java.lang.Integer> -int[].class->java.lang.Class<java.lang.Integer> -void.class->java.lang.Class<java.lang.Integer> diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassPrimitive/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassPrimitive/after/Expr.java deleted file mode 100644 index 44edef75bfe4..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassPrimitive/after/Expr.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.Set; - -class Expr { - private Class<Integer> myField; - public void meth() { - myField = int.class; - myField = int[].class; - myField = Set.class; - myField = Set[].class; - myField = void.class; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassPrimitive/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassPrimitive/before/Expr.java deleted file mode 100644 index 35a3d63f8dea..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassPrimitive/before/Expr.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.Set; - -class Expr { - private Object myField; - public void meth() { - myField = int.class; - myField = int[].class; - myField = Set.class; - myField = Set[].class; - myField = void.class; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassPrimitiveArray/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassPrimitiveArray/after/Expr.items deleted file mode 100644 index cd609774cf24..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassPrimitiveArray/after/Expr.items +++ /dev/null @@ -1,16 +0,0 @@ -Types: -PsiField:myField : java.lang.Class<int[]> -PsiReferenceExpression:myField : java.lang.Class<int[]> -PsiReferenceExpression:myField : java.lang.Class<int[]> -PsiReferenceExpression:myField : java.lang.Class<int[]> -PsiReferenceExpression:myField : java.lang.Class<int[]> -PsiReferenceExpression:myField : java.lang.Class<int[]> - -Conversions: - -New expression type changes: -Fails: -Set.class->java.lang.Class<int[]> -Set[].class->java.lang.Class<int[]> -int.class->java.lang.Class<int[]> -void.class->java.lang.Class<int[]> diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassPrimitiveArray/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassPrimitiveArray/after/Expr.java deleted file mode 100644 index 9939d2f3d410..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassPrimitiveArray/after/Expr.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.Set; - -class Expr { - private Class<int[]> myField; - public void meth() { - myField = int.class; - myField = int[].class; - myField = Set.class; - myField = Set[].class; - myField = void.class; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassPrimitiveArray/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassPrimitiveArray/before/Expr.java deleted file mode 100644 index 35a3d63f8dea..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassPrimitiveArray/before/Expr.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.Set; - -class Expr { - private Object myField; - public void meth() { - myField = int.class; - myField = int[].class; - myField = Set.class; - myField = Set[].class; - myField = void.class; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassRaw/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassRaw/after/Expr.items deleted file mode 100644 index 0bda2fd18195..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassRaw/after/Expr.items +++ /dev/null @@ -1,17 +0,0 @@ -Types: -PsiField:myField : java.lang.Class -PsiReferenceExpression:myField : java.lang.Class -PsiReferenceExpression:myField : java.lang.Class -PsiReferenceExpression:myField : java.lang.Class -PsiReferenceExpression:myField : java.lang.Class -PsiReferenceExpression:myField : java.lang.Class - -Conversions: -Set.class -> $ -Set[].class -> $ -int.class -> $ -int[].class -> $ -void.class -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassRaw/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassRaw/after/Expr.java deleted file mode 100644 index 9edcf9d47a31..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassRaw/after/Expr.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.Set; - -class Expr { - private Class myField; - public void meth() { - myField = int.class; - myField = int[].class; - myField = Set.class; - myField = Set[].class; - myField = void.class; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassRaw/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassRaw/before/Expr.java deleted file mode 100644 index 35a3d63f8dea..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassRaw/before/Expr.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.Set; - -class Expr { - private Object myField; - public void meth() { - myField = int.class; - myField = int[].class; - myField = Set.class; - myField = Set[].class; - myField = void.class; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassReference/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassReference/after/Expr.items deleted file mode 100644 index ee8fece53e89..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassReference/after/Expr.items +++ /dev/null @@ -1,16 +0,0 @@ -Types: -PsiField:myField : java.lang.Class<java.util.Set> -PsiReferenceExpression:myField : java.lang.Class<java.util.Set> -PsiReferenceExpression:myField : java.lang.Class<java.util.Set> -PsiReferenceExpression:myField : java.lang.Class<java.util.Set> -PsiReferenceExpression:myField : java.lang.Class<java.util.Set> -PsiReferenceExpression:myField : java.lang.Class<java.util.Set> - -Conversions: - -New expression type changes: -Fails: -Set[].class->java.lang.Class<java.util.Set> -int.class->java.lang.Class<java.util.Set> -int[].class->java.lang.Class<java.util.Set> -void.class->java.lang.Class<java.util.Set> diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassReference/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassReference/after/Expr.java deleted file mode 100644 index 45fd995735ae..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassReference/after/Expr.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.Set; - -class Expr { - private Class<Set> myField; - public void meth() { - myField = int.class; - myField = int[].class; - myField = Set.class; - myField = Set[].class; - myField = void.class; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassReference/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassReference/before/Expr.java deleted file mode 100644 index 35a3d63f8dea..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassReference/before/Expr.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.Set; - -class Expr { - private Object myField; - public void meth() { - myField = int.class; - myField = int[].class; - myField = Set.class; - myField = Set[].class; - myField = void.class; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassReferenceArray/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassReferenceArray/after/Expr.items deleted file mode 100644 index 26be6c5d8e6f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassReferenceArray/after/Expr.items +++ /dev/null @@ -1,16 +0,0 @@ -Types: -PsiField:myField : java.lang.Class<java.util.Set[]> -PsiReferenceExpression:myField : java.lang.Class<java.util.Set[]> -PsiReferenceExpression:myField : java.lang.Class<java.util.Set[]> -PsiReferenceExpression:myField : java.lang.Class<java.util.Set[]> -PsiReferenceExpression:myField : java.lang.Class<java.util.Set[]> -PsiReferenceExpression:myField : java.lang.Class<java.util.Set[]> - -Conversions: - -New expression type changes: -Fails: -Set.class->java.lang.Class<java.util.Set[]> -int.class->java.lang.Class<java.util.Set[]> -int[].class->java.lang.Class<java.util.Set[]> -void.class->java.lang.Class<java.util.Set[]> diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassReferenceArray/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassReferenceArray/after/Expr.java deleted file mode 100644 index 46b110d7f75f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassReferenceArray/after/Expr.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.Set; - -class Expr { - private Class<Set[]> myField; - public void meth() { - myField = int.class; - myField = int[].class; - myField = Set.class; - myField = Set[].class; - myField = void.class; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassReferenceArray/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassReferenceArray/before/Expr.java deleted file mode 100644 index 35a3d63f8dea..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassReferenceArray/before/Expr.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.Set; - -class Expr { - private Object myField; - public void meth() { - myField = int.class; - myField = int[].class; - myField = Set.class; - myField = Set[].class; - myField = void.class; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassSuper/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassSuper/after/Expr.items deleted file mode 100644 index 61336d444497..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassSuper/after/Expr.items +++ /dev/null @@ -1,17 +0,0 @@ -Types: -PsiField:myField : java.lang.Class<? super java.util.AbstractSet[]> -PsiReferenceExpression:myField : java.lang.Class<? super java.util.AbstractSet[]> -PsiReferenceExpression:myField : java.lang.Class<? super java.util.AbstractSet[]> -PsiReferenceExpression:myField : java.lang.Class<? super java.util.AbstractSet[]> -PsiReferenceExpression:myField : java.lang.Class<? super java.util.AbstractSet[]> -PsiReferenceExpression:myField : java.lang.Class<? super java.util.AbstractSet[]> - -Conversions: -Set[].class -> $ - -New expression type changes: -Fails: -Set.class->java.lang.Class<? super java.util.AbstractSet[]> -int.class->java.lang.Class<? super java.util.AbstractSet[]> -int[].class->java.lang.Class<? super java.util.AbstractSet[]> -void.class->java.lang.Class<? super java.util.AbstractSet[]> diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassSuper/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassSuper/after/Expr.java deleted file mode 100644 index 3ae94c8c1228..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassSuper/after/Expr.java +++ /dev/null @@ -1,13 +0,0 @@ -import java.util.AbstractSet; -import java.util.Set; - -class Expr { - private Class<? super AbstractSet[]> myField; - public void meth() { - myField = int.class; - myField = int[].class; - myField = Set.class; - myField = Set[].class; - myField = void.class; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassSuper/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassSuper/before/Expr.java deleted file mode 100644 index 1e5b26a44e4f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralClassSuper/before/Expr.java +++ /dev/null @@ -1,13 +0,0 @@ -import java.util.AbstractSet; -import java.util.Set; - -class Expr { - private Object myField; - public void meth() { - myField = int.class; - myField = int[].class; - myField = Set.class; - myField = Set[].class; - myField = void.class; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralDouble/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralDouble/after/Expr.items deleted file mode 100644 index eb7229ef905e..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralDouble/after/Expr.items +++ /dev/null @@ -1,36 +0,0 @@ -Types: -PsiField:myField : double -PsiReferenceExpression:myField : double -PsiReferenceExpression:myField : double -PsiReferenceExpression:myField : double -PsiReferenceExpression:myField : double -PsiReferenceExpression:myField : double -PsiReferenceExpression:myField : double -PsiReferenceExpression:myField : double -PsiReferenceExpression:myField : double -PsiReferenceExpression:myField : double -PsiReferenceExpression:myField : double -PsiReferenceExpression:myField : double -PsiReferenceExpression:myField : double -PsiReferenceExpression:myField : double -PsiReferenceExpression:myField : double -PsiReferenceExpression:myField : double - -Conversions: -'#' -> $ -043 -> $ -043F -> $ -043L -> $ -0x23 -> $ -0x23F -> $ -0x23L -> $ -35 -> $ -35F -> $ -35L -> $ - -New expression type changes: -Fails: -"#"->double -false->double -null->double -true->double diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralDouble/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralDouble/after/Expr.java deleted file mode 100644 index a1fafc25fe6e..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralDouble/after/Expr.java +++ /dev/null @@ -1,27 +0,0 @@ -class Expr { - private double myField; - public void meth() { - myField = null; - - myField = false; - myField = true; - - myField = 043; - myField = 35; - myField = 0x23; - - myField = '#'; - - myField = 043L; - myField = 35L; - myField = 0x23L; - - myField = 043F; - myField = 35F; - myField = 0x23F; - - myField = 35.0; - - myField = "#"; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralDouble/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralDouble/before/Expr.java deleted file mode 100644 index 05b89dc47d4f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralDouble/before/Expr.java +++ /dev/null @@ -1,27 +0,0 @@ -class Expr { - private Object myField; - public void meth() { - myField = null; - - myField = false; - myField = true; - - myField = 043; - myField = 35; - myField = 0x23; - - myField = '#'; - - myField = 043L; - myField = 35L; - myField = 0x23L; - - myField = 043F; - myField = 35F; - myField = 0x23F; - - myField = 35.0; - - myField = "#"; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralFloat/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralFloat/after/Expr.items deleted file mode 100644 index dcf1562d69b7..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralFloat/after/Expr.items +++ /dev/null @@ -1,35 +0,0 @@ -Types: -PsiField:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float - -Conversions: -'#' -> $ -043 -> $ -043L -> $ -0x23 -> $ -0x23F -> $ -0x23L -> $ -35 -> $ -35L -> $ - -New expression type changes: -Fails: -"#"->float -35.0->float -false->float -null->float -true->float diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralFloat/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralFloat/after/Expr.java deleted file mode 100644 index 8210b283c426..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralFloat/after/Expr.java +++ /dev/null @@ -1,27 +0,0 @@ -class Expr { - private float myField; - public void meth() { - myField = null; - - myField = false; - myField = true; - - myField = 043; - myField = 35; - myField = 0x23; - - myField = '#'; - - myField = 043L; - myField = 35L; - myField = 0x23L; - - myField = 043F; - myField = 35F; - myField = 0x23F; - - myField = 35.0; - - myField = "#"; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralFloat/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralFloat/before/Expr.java deleted file mode 100644 index 05b89dc47d4f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralFloat/before/Expr.java +++ /dev/null @@ -1,27 +0,0 @@ -class Expr { - private Object myField; - public void meth() { - myField = null; - - myField = false; - myField = true; - - myField = 043; - myField = 35; - myField = 0x23; - - myField = '#'; - - myField = 043L; - myField = 35L; - myField = 0x23L; - - myField = 043F; - myField = 35F; - myField = 0x23F; - - myField = 35.0; - - myField = "#"; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralInt/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralInt/after/Expr.items deleted file mode 100644 index 6969f1efd214..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralInt/after/Expr.items +++ /dev/null @@ -1,33 +0,0 @@ -Types: -PsiField:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int - -Conversions: -'#' -> $ - -New expression type changes: -Fails: -"#"->int -043F->int -043L->int -0x23L->int -35.0->int -35F->int -35L->int -false->int -null->int -true->int diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralInt/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralInt/after/Expr.java deleted file mode 100644 index 51bce6ac6430..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralInt/after/Expr.java +++ /dev/null @@ -1,27 +0,0 @@ -class Expr { - private int myField; - public void meth() { - myField = null; - - myField = false; - myField = true; - - myField = 043; - myField = 35; - myField = 0x23; - - myField = '#'; - - myField = 043L; - myField = 35L; - myField = 0x23L; - - myField = 043F; - myField = 35F; - myField = 0x23F; - - myField = 35.0; - - myField = "#"; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralInt/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralInt/before/Expr.java deleted file mode 100644 index 05b89dc47d4f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralInt/before/Expr.java +++ /dev/null @@ -1,27 +0,0 @@ -class Expr { - private Object myField; - public void meth() { - myField = null; - - myField = false; - myField = true; - - myField = 043; - myField = 35; - myField = 0x23; - - myField = '#'; - - myField = 043L; - myField = 35L; - myField = 0x23L; - - myField = 043F; - myField = 35F; - myField = 0x23F; - - myField = 35.0; - - myField = "#"; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralLong/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralLong/after/Expr.items deleted file mode 100644 index 71718fa25bb1..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralLong/after/Expr.items +++ /dev/null @@ -1,34 +0,0 @@ -Types: -PsiField:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long - -Conversions: -'#' -> $ -043 -> $ -0x23 -> $ -0x23F -> $ -35 -> $ - -New expression type changes: -Fails: -"#"->long -043F->long -35.0->long -35F->long -false->long -null->long -true->long diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralLong/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralLong/after/Expr.java deleted file mode 100644 index 1556e9f05ffb..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralLong/after/Expr.java +++ /dev/null @@ -1,27 +0,0 @@ -class Expr { - private long myField; - public void meth() { - myField = null; - - myField = false; - myField = true; - - myField = 043; - myField = 35; - myField = 0x23; - - myField = '#'; - - myField = 043L; - myField = 35L; - myField = 0x23L; - - myField = 043F; - myField = 35F; - myField = 0x23F; - - myField = 35.0; - - myField = "#"; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralLong/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralLong/before/Expr.java deleted file mode 100644 index 05b89dc47d4f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralLong/before/Expr.java +++ /dev/null @@ -1,27 +0,0 @@ -class Expr { - private Object myField; - public void meth() { - myField = null; - - myField = false; - myField = true; - - myField = 043; - myField = 35; - myField = 0x23; - - myField = '#'; - - myField = 043L; - myField = 35L; - myField = 0x23L; - - myField = 043F; - myField = 35F; - myField = 0x23F; - - myField = 35.0; - - myField = "#"; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralShort/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralShort/after/Expr.items deleted file mode 100644 index f282b956c933..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralShort/after/Expr.items +++ /dev/null @@ -1,37 +0,0 @@ -Types: -PsiField:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short - -Conversions: - -New expression type changes: -Fails: -"#"->short -'#'->short -043->short -043F->short -043L->short -0x23->short -0x23F->short -0x23L->short -35->short -35.0->short -35F->short -35L->short -false->short -null->short -true->short diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralShort/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralShort/after/Expr.java deleted file mode 100644 index 39b549b335bb..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralShort/after/Expr.java +++ /dev/null @@ -1,27 +0,0 @@ -class Expr { - private short myField; - public void meth() { - myField = null; - - myField = false; - myField = true; - - myField = 043; - myField = 35; - myField = 0x23; - - myField = '#'; - - myField = 043L; - myField = 35L; - myField = 0x23L; - - myField = 043F; - myField = 35F; - myField = 0x23F; - - myField = 35.0; - - myField = "#"; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralShort/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralShort/before/Expr.java deleted file mode 100644 index 05b89dc47d4f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralShort/before/Expr.java +++ /dev/null @@ -1,27 +0,0 @@ -class Expr { - private Object myField; - public void meth() { - myField = null; - - myField = false; - myField = true; - - myField = 043; - myField = 35; - myField = 0x23; - - myField = '#'; - - myField = 043L; - myField = 35L; - myField = 0x23L; - - myField = 043F; - myField = 35F; - myField = 0x23F; - - myField = 35.0; - - myField = "#"; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralString/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralString/after/Expr.items deleted file mode 100644 index 6bb1edafdfa8..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralString/after/Expr.items +++ /dev/null @@ -1,35 +0,0 @@ -Types: -PsiField:myField : java.lang.String -PsiReferenceExpression:myField : java.lang.String -PsiReferenceExpression:myField : java.lang.String -PsiReferenceExpression:myField : java.lang.String -PsiReferenceExpression:myField : java.lang.String -PsiReferenceExpression:myField : java.lang.String -PsiReferenceExpression:myField : java.lang.String -PsiReferenceExpression:myField : java.lang.String -PsiReferenceExpression:myField : java.lang.String -PsiReferenceExpression:myField : java.lang.String -PsiReferenceExpression:myField : java.lang.String -PsiReferenceExpression:myField : java.lang.String -PsiReferenceExpression:myField : java.lang.String -PsiReferenceExpression:myField : java.lang.String -PsiReferenceExpression:myField : java.lang.String -PsiReferenceExpression:myField : java.lang.String - -Conversions: - -New expression type changes: -Fails: -'#'->java.lang.String -043->java.lang.String -043F->java.lang.String -043L->java.lang.String -0x23->java.lang.String -0x23F->java.lang.String -0x23L->java.lang.String -35->java.lang.String -35.0->java.lang.String -35F->java.lang.String -35L->java.lang.String -false->java.lang.String -true->java.lang.String diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralString/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralString/after/Expr.java deleted file mode 100644 index 3adc44418ad4..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralString/after/Expr.java +++ /dev/null @@ -1,27 +0,0 @@ -class Expr { - private String myField; - public void meth() { - myField = null; - - myField = false; - myField = true; - - myField = 043; - myField = 35; - myField = 0x23; - - myField = '#'; - - myField = 043L; - myField = 35L; - myField = 0x23L; - - myField = 043F; - myField = 35F; - myField = 0x23F; - - myField = 35.0; - - myField = "#"; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralString/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralString/before/Expr.java deleted file mode 100644 index 05b89dc47d4f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprLiteralString/before/Expr.java +++ /dev/null @@ -1,27 +0,0 @@ -class Expr { - private Object myField; - public void meth() { - myField = null; - - myField = false; - myField = true; - - myField = 043; - myField = 35; - myField = 0x23; - - myField = '#'; - - myField = 043L; - myField = 35L; - myField = 0x23L; - - myField = 043F; - myField = 35F; - myField = 0x23F; - - myField = 35.0; - - myField = "#"; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayArray2Lvalue/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayArray2Lvalue/after/Expr.items deleted file mode 100644 index 444531918ce0..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayArray2Lvalue/after/Expr.items +++ /dev/null @@ -1,22 +0,0 @@ -Types: -PsiArrayInitializerExpression:{pfc} : FaceParent[][] -PsiArrayInitializerExpression:{pfc} : FaceParent[][] -PsiArrayInitializerExpression:{{pfc}} : FaceParent[][][] -PsiField:myArrayOne : FaceParent[][] -PsiField:myArrayTwo : FaceParent[][][] -PsiNewExpression:new FaceChild[][][]{{pfc}} : FaceParent[][][] -PsiNewExpression:new FaceChild[][]{pfc} : FaceParent[][] -PsiParameter:pfc : FaceParent[] -PsiReferenceExpression:myArrayOne : FaceParent[][] -PsiReferenceExpression:myArrayTwo : FaceParent[][][] -PsiReferenceExpression:pfc : FaceParent[] -PsiReferenceExpression:pfc : FaceParent[] - -Conversions: -pfc -> $ -pfc -> $ - -New expression type changes: -new FaceChild[][][]{{pfc}} -> FaceParent[][][] -new FaceChild[][]{pfc} -> FaceParent[][] -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayArray2Lvalue/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayArray2Lvalue/after/Expr.java deleted file mode 100644 index 570367998bd1..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayArray2Lvalue/after/Expr.java +++ /dev/null @@ -1,11 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} - -class Expr { - private FaceParent[][] myArrayOne; - private FaceParent[][][] myArrayTwo; - public void meth(FaceParent[] pfc) { - myArrayOne = new FaceParent[][]{pfc}; - myArrayTwo = new FaceParent[][][]{{pfc}}; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayArray2Lvalue/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayArray2Lvalue/before/Expr.java deleted file mode 100644 index d88808766d7d..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayArray2Lvalue/before/Expr.java +++ /dev/null @@ -1,11 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} - -class Expr { - private FaceChild[][] myArrayOne; - private FaceChild[][][] myArrayTwo; - public void meth(FaceChild[] pfc) { - myArrayOne = new FaceChild[][]{pfc}; - myArrayTwo = new FaceChild[][][]{{pfc}}; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayArray2Rvalue/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayArray2Rvalue/after/Expr.items deleted file mode 100644 index 4b4b9036abb0..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayArray2Rvalue/after/Expr.items +++ /dev/null @@ -1,14 +0,0 @@ -Types: -PsiArrayInitializerExpression:{null} : ClassParent[][] -PsiArrayInitializerExpression:{pfc} : ClassParent[][] -PsiField:myField : ClassParent[][][] -PsiNewExpression:new FaceChild[][][]{{pfc}, {null}, null} : ClassParent[][][] -PsiParameter:pfc : ClassParent[] -PsiReferenceExpression:myField : ClassParent[][][] -PsiReferenceExpression:pfc : ClassParent[] - -Conversions: - -New expression type changes: -new FaceChild[][][]{{pfc}, {null}, null} -> ClassParent[][][] -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayArray2Rvalue/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayArray2Rvalue/after/Expr.java deleted file mode 100644 index fc54bb6ca9d6..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayArray2Rvalue/after/Expr.java +++ /dev/null @@ -1,11 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} -class ClassParent implements FaceChild {} -class ClassChild extends ClassParent {} - -class Expr { - private ClassParent[][][] myField; - public void meth(ClassParent[] pfc) { - myField = new ClassParent[][][]{{pfc}, {null}, null}; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayArray2Rvalue/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayArray2Rvalue/before/Expr.java deleted file mode 100644 index 8c4093e44d75..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayArray2Rvalue/before/Expr.java +++ /dev/null @@ -1,11 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} -class ClassParent implements FaceChild {} -class ClassChild extends ClassParent {} - -class Expr { - private FaceChild[][][] myField; - public void meth(FaceChild[] pfc) { - myField = new FaceChild[][][]{{pfc}, {null}, null}; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayGen2Rvalue/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayGen2Rvalue/after/Expr.items deleted file mode 100644 index 825ef4f10f19..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayGen2Rvalue/after/Expr.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:myField : java.util.Set<java.lang.Integer>[] -PsiReferenceExpression:myField : java.util.Set<java.lang.Integer>[] - -Conversions: - -New expression type changes: -Fails: -new Set[1]->java.util.Set<java.lang.Integer>[] diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayGen2Rvalue/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayGen2Rvalue/after/Expr.java deleted file mode 100644 index 5083896eb293..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayGen2Rvalue/after/Expr.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.Set; - -class Expr { - private Set<Integer>[] myField; - public void meth() { - myField = new Set[1]; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayGen2Rvalue/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayGen2Rvalue/before/Expr.java deleted file mode 100644 index c2301a434ec9..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayGen2Rvalue/before/Expr.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.Set; - -class Expr { - private Set[] myField; - public void meth() { - myField = new Set[1]; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayPrimitive2Lvalue/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayPrimitive2Lvalue/after/Expr.items deleted file mode 100644 index d5976f11c486..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayPrimitive2Lvalue/after/Expr.items +++ /dev/null @@ -1,25 +0,0 @@ -Types: -PsiArrayInitializerExpression:{!p} : int[] -PsiArrayInitializerExpression:{p} : int[] -PsiArrayInitializerExpression:{p} : int[] -PsiArrayInitializerExpression:{{p}, {!p}} : int[][] -PsiField:myArrayOne : int[] -PsiField:myArrayTwo : int[][] -PsiNewExpression:new boolean[][]{{p}, {!p}} : int[][] -PsiNewExpression:new boolean[]{p} : int[] -PsiParameter:p : int -PsiReferenceExpression:myArrayOne : int[] -PsiReferenceExpression:myArrayTwo : int[][] -PsiReferenceExpression:p : int -PsiReferenceExpression:p : int -PsiReferenceExpression:p : int - -Conversions: -p -> $ -p -> $ - -New expression type changes: -new boolean[][]{{p}, {!p}} -> int[][] -new boolean[]{p} -> int[] -Fails: -!p->int diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayPrimitive2Lvalue/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayPrimitive2Lvalue/after/Expr.java deleted file mode 100644 index 0c6c31bf4929..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayPrimitive2Lvalue/after/Expr.java +++ /dev/null @@ -1,8 +0,0 @@ -class Expr { - private int[] myArrayOne; - private int[][] myArrayTwo; - public void meth(int p) { - myArrayOne = new int[]{p}; - myArrayTwo = new int[][]{{p}, {!p}}; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayPrimitive2Lvalue/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayPrimitive2Lvalue/before/Expr.java deleted file mode 100644 index e7724ca422f4..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayPrimitive2Lvalue/before/Expr.java +++ /dev/null @@ -1,8 +0,0 @@ -class Expr { - private boolean[] myArrayOne; - private boolean[][] myArrayTwo; - public void meth(boolean p) { - myArrayOne = new boolean[]{p}; - myArrayTwo = new boolean[][]{{p}, {!p}}; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayPrimitive2Rvalue/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayPrimitive2Rvalue/after/Expr.items deleted file mode 100644 index 5f371c0c6430..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayPrimitive2Rvalue/after/Expr.items +++ /dev/null @@ -1,21 +0,0 @@ -Types: -PsiArrayInitializerExpression:{!p} : int[] -PsiArrayInitializerExpression:{0} : int[] -PsiArrayInitializerExpression:{p} : int[] -PsiArrayInitializerExpression:{true} : int[] -PsiArrayInitializerExpression:{{p}, {!p}, {true}, {0}} : int[][] -PsiField:myField : int[][] -PsiNewExpression:new boolean[][]{{p}, {!p}, {true}, {0}} : int[][] -PsiParameter:p : int -PsiReferenceExpression:myField : int[][] -PsiReferenceExpression:p : int -PsiReferenceExpression:p : int - -Conversions: -p -> $ - -New expression type changes: -new boolean[][]{{p}, {!p}, {true}, {0}} -> int[][] -Fails: -!p->int -true->int diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayPrimitive2Rvalue/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayPrimitive2Rvalue/after/Expr.java deleted file mode 100644 index 58017644820c..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayPrimitive2Rvalue/after/Expr.java +++ /dev/null @@ -1,6 +0,0 @@ -class Expr { - private int[][] myField; - public void meth(int p) { - myField = new int[][]{{p}, {!p}, {true}, {0}}; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayPrimitive2Rvalue/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayPrimitive2Rvalue/before/Expr.java deleted file mode 100644 index cb1e0d64aa4b..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayPrimitive2Rvalue/before/Expr.java +++ /dev/null @@ -1,6 +0,0 @@ -class Expr { - private boolean[][] myField; - public void meth(boolean p) { - myField = new boolean[][]{{p}, {!p}, {true}, {0}}; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Lvalue/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Lvalue/after/Expr.items deleted file mode 100644 index a1472a46da67..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Lvalue/after/Expr.items +++ /dev/null @@ -1,34 +0,0 @@ -Types: -PsiArrayInitializerExpression:{pcc} : FaceParent[] -PsiArrayInitializerExpression:{pcp} : FaceParent[] -PsiArrayInitializerExpression:{pfc, pcp, pcc} : FaceParent[] -PsiArrayInitializerExpression:{pfc} : FaceParent[] -PsiArrayInitializerExpression:{{pfc}, {pcp}, {pcc}} : FaceParent[][] -PsiField:myArrayOne : FaceParent[] -PsiField:myArrayTwo : FaceParent[][] -PsiNewExpression:new FaceChild[][]{{pfc}, {pcp}, {pcc}} : FaceParent[][] -PsiNewExpression:new FaceChild[]{pfc, pcp, pcc} : FaceParent[] -PsiParameter:pcc : ClassChild -PsiParameter:pcp : ClassParent -PsiParameter:pfc : FaceParent -PsiReferenceExpression:myArrayOne : FaceParent[] -PsiReferenceExpression:myArrayTwo : FaceParent[][] -PsiReferenceExpression:pcc : ClassChild -PsiReferenceExpression:pcc : ClassChild -PsiReferenceExpression:pcp : ClassParent -PsiReferenceExpression:pcp : ClassParent -PsiReferenceExpression:pfc : FaceParent -PsiReferenceExpression:pfc : FaceParent - -Conversions: -pcc -> $ -pcc -> $ -pcp -> $ -pcp -> $ -pfc -> $ -pfc -> $ - -New expression type changes: -new FaceChild[][]{{pfc}, {pcp}, {pcc}} -> FaceParent[][] -new FaceChild[]{pfc, pcp, pcc} -> FaceParent[] -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Lvalue/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Lvalue/after/Expr.java deleted file mode 100644 index bfae5390508e..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Lvalue/after/Expr.java +++ /dev/null @@ -1,13 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} -class ClassParent implements FaceChild {} -class ClassChild extends ClassParent {} - -class Expr { - private FaceParent[] myArrayOne; - private FaceParent[][] myArrayTwo; - public void meth(FaceParent pfc, ClassParent pcp, ClassChild pcc) { - myArrayOne = new FaceParent[]{pfc, pcp, pcc}; - myArrayTwo = new FaceParent[][]{{pfc}, {pcp}, {pcc}}; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Lvalue/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Lvalue/before/Expr.java deleted file mode 100644 index 5cb70f7265f7..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Lvalue/before/Expr.java +++ /dev/null @@ -1,13 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} -class ClassParent implements FaceChild {} -class ClassChild extends ClassParent {} - -class Expr { - private FaceChild[] myArrayOne; - private FaceChild[][] myArrayTwo; - public void meth(FaceChild pfc, ClassParent pcp, ClassChild pcc) { - myArrayOne = new FaceChild[]{pfc, pcp, pcc}; - myArrayTwo = new FaceChild[][]{{pfc}, {pcp}, {pcc}}; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Rvalue/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Rvalue/after/Expr.items deleted file mode 100644 index 4dabd7d9161e..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Rvalue/after/Expr.items +++ /dev/null @@ -1,18 +0,0 @@ -Types: -PsiArrayInitializerExpression:{null} : ClassParent[] -PsiArrayInitializerExpression:{pcc} : ClassParent[] -PsiArrayInitializerExpression:{pcp} : ClassParent[] -PsiArrayInitializerExpression:{pfc} : ClassParent[] -PsiField:myField : ClassParent[][] -PsiNewExpression:new FaceChild[][]{{pfc}, {pcp}, {pcc}, {null}} : ClassParent[][] -PsiParameter:pcc : ClassChild -PsiParameter:pfc : ClassParent -PsiReferenceExpression:myField : ClassParent[][] -PsiReferenceExpression:pcc : ClassChild -PsiReferenceExpression:pfc : ClassParent - -Conversions: - -New expression type changes: -new FaceChild[][]{{pfc}, {pcp}, {pcc}, {null}} -> ClassParent[][] -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Rvalue/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Rvalue/after/Expr.java deleted file mode 100644 index f2d53b50f272..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Rvalue/after/Expr.java +++ /dev/null @@ -1,11 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} -class ClassParent implements FaceChild {} -class ClassChild extends ClassParent {} - -class Expr { - private ClassParent[][] myField; - public void meth(ClassParent pfc, ClassParent pcp, ClassChild pcc) { - myField = new ClassParent[][]{{pfc}, {pcp}, {pcc}, {null}}; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Rvalue/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Rvalue/before/Expr.java deleted file mode 100644 index 9e973b7925a0..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Rvalue/before/Expr.java +++ /dev/null @@ -1,11 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} -class ClassParent implements FaceChild {} -class ClassChild extends ClassParent {} - -class Expr { - private FaceChild[][] myField; - public void meth(FaceChild pfc, ClassParent pcp, ClassChild pcc) { - myField = new FaceChild[][]{{pfc}, {pcp}, {pcc}, {null}}; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGen/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGen/after/Expr.items deleted file mode 100644 index d19a8ab094b7..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGen/after/Expr.items +++ /dev/null @@ -1,17 +0,0 @@ -Types: -PsiField:myField : java.util.Set<Subject> -PsiNewExpression:new Set() : java.util.Set -PsiNewExpression:new Set<Ancestor>() : java.util.Set<Subject> -PsiNewExpression:new Set<Descendant>() : java.util.Set<Subject> -PsiReferenceExpression:myField : java.util.Set<Subject> -PsiReferenceExpression:myField : java.util.Set<Subject> -PsiReferenceExpression:myField : java.util.Set<Subject> -PsiReferenceExpression:myField : java.util.Set<Subject> - -Conversions: - -New expression type changes: -new Set() -> java.util.Set -new Set<Ancestor>() -> java.util.Set<Subject> -new Set<Descendant>() -> java.util.Set<Subject> -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGen/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGen/after/Expr.java deleted file mode 100644 index aab73939b929..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGen/after/Expr.java +++ /dev/null @@ -1,15 +0,0 @@ -import java.util.Set; - -class Ancestor {} -class Subject extends Ancestor {} -class Descendant extends Subject {} - -class Expr { - private Set<Subject> myField; - public void meth() { - myField = new Set(); - myField = new Set<Subject>(); - myField = new Set<Subject>(); - myField = new Set<Subject>(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGen/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGen/before/Expr.java deleted file mode 100644 index e38d8aa7229f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGen/before/Expr.java +++ /dev/null @@ -1,15 +0,0 @@ -import java.util.Set; - -class Ancestor {} -class Subject extends Ancestor {} -class Descendant extends Subject {} - -class Expr { - private Object myField; - public void meth() { - myField = new Set(); - myField = new Set<Ancestor>(); - myField = new Set<Subject>(); - myField = new Set<Descendant>(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGenExtends/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGenExtends/after/Expr.items deleted file mode 100644 index 9003258e73a5..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGenExtends/after/Expr.items +++ /dev/null @@ -1,16 +0,0 @@ -Types: -PsiField:myField : java.util.Set<? extends Subject> -PsiNewExpression:new Set() : java.util.Set -PsiNewExpression:new Set<Ancestor>() : java.util.Set<Subject> -PsiNewExpression:new Set<Subject>() : java.util.Set<Subject> -PsiReferenceExpression:myField : java.util.Set<? extends Subject> -PsiReferenceExpression:myField : java.util.Set<? extends Subject> -PsiReferenceExpression:myField : java.util.Set<? extends Subject> - -Conversions: - -New expression type changes: -new Set() -> java.util.Set -new Set<Ancestor>() -> java.util.Set<Subject> -new Set<Subject>() -> java.util.Set<Subject> -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGenExtends/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGenExtends/after/Expr.java deleted file mode 100644 index f939534d6972..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGenExtends/after/Expr.java +++ /dev/null @@ -1,15 +0,0 @@ -import java.util.Set; - -class Ancestor {} -class Subject extends Ancestor {} -class Descendant extends Subject {} - -class Expr { - private Set<? extends Subject> myField; - public void meth() { - myField = new Set(); - myField = new Set<Subject>(); - myField = new Set<Subject>(); - // myField = new Set<Descendant>(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGenExtends/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGenExtends/before/Expr.java deleted file mode 100644 index e65ce8b9a8fc..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGenExtends/before/Expr.java +++ /dev/null @@ -1,15 +0,0 @@ -import java.util.Set; - -class Ancestor {} -class Subject extends Ancestor {} -class Descendant extends Subject {} - -class Expr { - private Object myField; - public void meth() { - myField = new Set(); - myField = new Set<Ancestor>(); - myField = new Set<Subject>(); - // myField = new Set<Descendant>(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGenSuper/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGenSuper/after/Expr.items deleted file mode 100644 index ca323d833a2c..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGenSuper/after/Expr.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiField:myField : java.util.Set<? super Subject> -PsiNewExpression:new Set() : java.util.Set -PsiReferenceExpression:myField : java.util.Set<? super Subject> - -Conversions: - -New expression type changes: -new Set() -> java.util.Set -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGenSuper/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGenSuper/after/Expr.java deleted file mode 100644 index 4f5a29eecc6c..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGenSuper/after/Expr.java +++ /dev/null @@ -1,15 +0,0 @@ -import java.util.Set; - -class Ancestor {} -class Subject extends Ancestor {} -class Descendant extends Subject {} - -class Expr { - private Set<? super Subject> myField; - public void meth() { - myField = new Set(); - // myField = new Set<Ancestor>(); - // myField = new Set<Subject>(); - // myField = new Set<Descendant>(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGenSuper/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGenSuper/before/Expr.java deleted file mode 100644 index 73a22ebeccde..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewGenSuper/before/Expr.java +++ /dev/null @@ -1,15 +0,0 @@ -import java.util.Set; - -class Ancestor {} -class Subject extends Ancestor {} -class Descendant extends Subject {} - -class Expr { - private Object myField; - public void meth() { - myField = new Set(); - // myField = new Set<Ancestor>(); - // myField = new Set<Subject>(); - // myField = new Set<Descendant>(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewReference/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewReference/after/Expr.items deleted file mode 100644 index cab7f8173076..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewReference/after/Expr.items +++ /dev/null @@ -1,27 +0,0 @@ -Types: -PsiField:myField : Expr.Subject -PsiNewExpression:new Descendant() : Expr.Descendant -PsiNewExpression:new Descendant() {} : Expr.Descendant -PsiNewExpression:new Subject() {} : Expr.Subject -PsiNewExpression:this.new Descendant() : Expr.Descendant -PsiReferenceExpression:myField : Expr.Subject -PsiReferenceExpression:myField : Expr.Subject -PsiReferenceExpression:myField : Expr.Subject -PsiReferenceExpression:myField : Expr.Subject -PsiReferenceExpression:myField : Expr.Subject -PsiReferenceExpression:myField : Expr.Subject -PsiReferenceExpression:myField : Expr.Subject -PsiReferenceExpression:myField : Expr.Subject -PsiReferenceExpression:myField : Expr.Subject - -Conversions: - -New expression type changes: -new Descendant() -> Expr.Descendant -new Descendant() {} -> Expr.Descendant -new Subject() {} -> Expr.Subject -this.new Descendant() -> Expr.Descendant -Fails: -new Ancestor()->Expr.Subject -new Ancestor() {}->Expr.Subject -this.new Ancestor()->Expr.Subject diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewReference/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewReference/after/Expr.java deleted file mode 100644 index 5cc9c87ec7e4..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewReference/after/Expr.java +++ /dev/null @@ -1,21 +0,0 @@ -class Expr { - private class Ancestor {} - private class Subject extends Ancestor {} - private class Descendant extends Subject {} - - private Subject myField; - - public void meth() { - myField = new Ancestor(); - myField = this.new Ancestor(); - myField = new Ancestor() {}; - - myField = new Subject(); - myField = this.new Subject(); - myField = new Subject() {}; - - myField = new Descendant(); - myField = this.new Descendant(); - myField = new Descendant() {}; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewReference/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewReference/before/Expr.java deleted file mode 100644 index ed03e4ddc1d3..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprNewReference/before/Expr.java +++ /dev/null @@ -1,21 +0,0 @@ -class Expr { - private class Ancestor {} - private class Subject extends Ancestor {} - private class Descendant extends Subject {} - - private Ancestor myField; - - public void meth() { - myField = new Ancestor(); - myField = this.new Ancestor(); - myField = new Ancestor() {}; - - myField = new Subject(); - myField = this.new Subject(); - myField = new Subject() {}; - - myField = new Descendant(); - myField = this.new Descendant(); - myField = new Descendant() {}; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprReturn2Lvalue/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprReturn2Lvalue/after/Expr.items deleted file mode 100644 index e91631f5c332..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprReturn2Lvalue/after/Expr.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiMethod:meth : java.lang.String -PsiParameter:p : java.lang.String -PsiReferenceExpression:p : java.lang.String - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprReturn2Lvalue/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprReturn2Lvalue/after/Expr.java deleted file mode 100644 index 37c310d405e3..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprReturn2Lvalue/after/Expr.java +++ /dev/null @@ -1,5 +0,0 @@ -class Expr { - public String meth(String p) { - return p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprReturn2Lvalue/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprReturn2Lvalue/before/Expr.java deleted file mode 100644 index 76e26b5c15bb..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprReturn2Lvalue/before/Expr.java +++ /dev/null @@ -1,5 +0,0 @@ -class Expr { - public int meth(int p) { - return p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprReturn2Rvalue/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprReturn2Rvalue/after/Expr.items deleted file mode 100644 index e91631f5c332..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprReturn2Rvalue/after/Expr.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiMethod:meth : java.lang.String -PsiParameter:p : java.lang.String -PsiReferenceExpression:p : java.lang.String - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprReturn2Rvalue/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprReturn2Rvalue/after/Expr.java deleted file mode 100644 index 37c310d405e3..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprReturn2Rvalue/after/Expr.java +++ /dev/null @@ -1,5 +0,0 @@ -class Expr { - public String meth(String p) { - return p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprReturn2Rvalue/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprReturn2Rvalue/before/Expr.java deleted file mode 100644 index 76e26b5c15bb..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprReturn2Rvalue/before/Expr.java +++ /dev/null @@ -1,5 +0,0 @@ -class Expr { - public int meth(int p) { - return p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprTernary/after/Expr.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprTernary/after/Expr.items deleted file mode 100644 index 6e445ca2c431..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprTernary/after/Expr.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiLocalVariable:v : java.lang.String -PsiParameter:pd : java.lang.String -PsiReferenceExpression:pd : java.lang.String -PsiReferenceExpression:pd : java.lang.String - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprTernary/after/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprTernary/after/Expr.java deleted file mode 100644 index 1e75f910f300..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprTernary/after/Expr.java +++ /dev/null @@ -1,5 +0,0 @@ -class Expr { - public void meth(String pd, int pp) { - String v = pp > 0 ? pd : pd; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprTernary/before/Expr.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprTernary/before/Expr.java deleted file mode 100644 index 3a714e5334a4..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/exprTernary/before/Expr.java +++ /dev/null @@ -1,5 +0,0 @@ -class Expr { - public void meth(double pd, int pp) { - double v = pp > 0 ? pd : pd; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/overridingDown/after/Overriding.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/overridingDown/after/Overriding.java deleted file mode 100644 index 9fb5b2161ba1..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/overridingDown/after/Overriding.java +++ /dev/null @@ -1,13 +0,0 @@ -class Parent { - private byte myInt; - public byte getInt() { - return myInt; - } -} - -class Child extends Parent { - private byte myInt; - public byte getInt() { - return myInt; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/overridingDown/after/Parent.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/overridingDown/after/Parent.items deleted file mode 100644 index 0857363a2808..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/overridingDown/after/Parent.items +++ /dev/null @@ -1,12 +0,0 @@ -Types: -PsiField:myInt : byte -PsiField:myInt : byte -PsiMethod:getInt : byte -PsiMethod:getInt : byte -PsiReferenceExpression:myInt : byte -PsiReferenceExpression:myInt : byte - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/overridingDown/before/Overriding.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/overridingDown/before/Overriding.java deleted file mode 100644 index 212ce8080636..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/overridingDown/before/Overriding.java +++ /dev/null @@ -1,13 +0,0 @@ -class Parent { - private int myInt; - public int getInt() { - return myInt; - } -} - -class Child extends Parent { - private int myInt; - public int getInt() { - return myInt; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/overridingUp/after/Child.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/overridingUp/after/Child.items deleted file mode 100644 index 0857363a2808..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/overridingUp/after/Child.items +++ /dev/null @@ -1,12 +0,0 @@ -Types: -PsiField:myInt : byte -PsiField:myInt : byte -PsiMethod:getInt : byte -PsiMethod:getInt : byte -PsiReferenceExpression:myInt : byte -PsiReferenceExpression:myInt : byte - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/overridingUp/after/Overriding.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/overridingUp/after/Overriding.java deleted file mode 100644 index 9fb5b2161ba1..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/overridingUp/after/Overriding.java +++ /dev/null @@ -1,13 +0,0 @@ -class Parent { - private byte myInt; - public byte getInt() { - return myInt; - } -} - -class Child extends Parent { - private byte myInt; - public byte getInt() { - return myInt; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/overridingUp/before/Overriding.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/overridingUp/before/Overriding.java deleted file mode 100644 index 212ce8080636..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/overridingUp/before/Overriding.java +++ /dev/null @@ -1,13 +0,0 @@ -class Parent { - private int myInt; - public int getInt() { - return myInt; - } -} - -class Child extends Parent { - private int myInt; - public int getInt() { - return myInt; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/specJavadoc/after/Spec.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/specJavadoc/after/Spec.items deleted file mode 100644 index 4428712f4683..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/specJavadoc/after/Spec.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiParameter:p : java.util.Set - -Conversions: -#meth(double) -> PsiMethod:meth - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/specJavadoc/after/Spec.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/specJavadoc/after/Spec.java deleted file mode 100644 index b6c748c1e749..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/specJavadoc/after/Spec.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.Set; - -class Spec { - /** - * @see #meth(java.util.Set) - */ - public void methRef() { - } - - public void meth(Set p) { - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/specJavadoc/before/Spec.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/specJavadoc/before/Spec.java deleted file mode 100644 index 45080dc2dec1..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/specJavadoc/before/Spec.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.Set; - -class Spec { - /** - * @see #meth(double) - */ - public void methRef() { - } - - public void meth(double p) { - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/specNotUsed/after/Spec.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/specNotUsed/after/Spec.items deleted file mode 100644 index 8ffc5c9a6744..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/specNotUsed/after/Spec.items +++ /dev/null @@ -1,7 +0,0 @@ -Types: -PsiField:myField : boolean - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/specNotUsed/after/Spec.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/specNotUsed/after/Spec.java deleted file mode 100644 index 03d0dc267246..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/specNotUsed/after/Spec.java +++ /dev/null @@ -1,3 +0,0 @@ -class Spec { - private boolean myField; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/specNotUsed/before/Spec.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/specNotUsed/before/Spec.java deleted file mode 100644 index 36a606c54faa..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/specNotUsed/before/Spec.java +++ /dev/null @@ -1,3 +0,0 @@ -class Spec { - private int myField; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayReftype2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayReftype2Lvalue/after/Type.items deleted file mode 100644 index e56da57e1062..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayReftype2Lvalue/after/Type.items +++ /dev/null @@ -1,13 +0,0 @@ -Types: -PsiField:myDescendants : Subject[] -PsiParameter:p : Subject[] -PsiReferenceExpression:myDescendants : Subject[] -PsiReferenceExpression:p : Subject[] -PsiReferenceExpression:p : Subject[] -PsiReferenceExpression:p : Subject[] - -Conversions: -myAncestors -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayReftype2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayReftype2Lvalue/after/Type.java deleted file mode 100644 index 5b667afd7284..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayReftype2Lvalue/after/Type.java +++ /dev/null @@ -1,15 +0,0 @@ -interface Ancestor {} -interface Subject extends Ancestor {} -class Descendant implements Subject {} - -class Type { - private Ancestor[] myAncestors; - private Subject[] mySubjects; - private Subject[] myDescendants; - - public void meth(Subject[] p) { - myAncestors = p; - mySubjects = p; - myDescendants = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayReftype2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayReftype2Lvalue/before/Type.java deleted file mode 100644 index 6c0ad8e907ae..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayReftype2Lvalue/before/Type.java +++ /dev/null @@ -1,15 +0,0 @@ -interface Ancestor {} -interface Subject extends Ancestor {} -class Descendant implements Subject {} - -class Type { - private Ancestor[] myAncestors; - private Subject[] mySubjects; - private Descendant[] myDescendants; - - public void meth(Descendant[] p) { - myAncestors = p; - mySubjects = p; - myDescendants = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayReftype2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayReftype2Rvalue/after/Type.items deleted file mode 100644 index aa0545cd97f1..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayReftype2Rvalue/after/Type.items +++ /dev/null @@ -1,13 +0,0 @@ -Types: -PsiField:myField : Subject[][] -PsiParameter:pa : Subject[][] -PsiReferenceExpression:myField : Subject[][] -PsiReferenceExpression:myField : Subject[][] -PsiReferenceExpression:myField : Subject[][] -PsiReferenceExpression:pa : Subject[][] - -Conversions: -pd -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayReftype2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayReftype2Rvalue/after/Type.java deleted file mode 100644 index 1dc9d19b69d7..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayReftype2Rvalue/after/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -interface Ancestor {} -interface Subject extends Ancestor {} -class Descendant implements Subject {} - -class Type { - private Subject[][] myField; - public void meth(Subject[][] pa, Subject[][] ps, Descendant[][] pd) { - myField = pa; - myField = ps; - myField = pd; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayReftype2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayReftype2Rvalue/before/Type.java deleted file mode 100644 index b84f5fada9b6..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayReftype2Rvalue/before/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -interface Ancestor {} -interface Subject extends Ancestor {} -class Descendant implements Subject {} - -class Type { - private Ancestor[][] myField; - public void meth(Ancestor[][] pa, Subject[][] ps, Descendant[][] pd) { - myField = pa; - myField = ps; - myField = pd; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayRoots2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayRoots2Lvalue/after/Type.items deleted file mode 100644 index bfcf79449245..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayRoots2Lvalue/after/Type.items +++ /dev/null @@ -1,16 +0,0 @@ -Types: -PsiField:myHolder : Holder[] -PsiParameter:p : Holder[] -PsiReferenceExpression:myHolder : Holder[] -PsiReferenceExpression:p : Holder[] -PsiReferenceExpression:p : Holder[] -PsiReferenceExpression:p : Holder[] -PsiReferenceExpression:p : Holder[] - -Conversions: -myCloneable -> $ -myObject -> $ -mySerializable -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayRoots2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayRoots2Lvalue/after/Type.java deleted file mode 100644 index ea67626d3e12..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayRoots2Lvalue/after/Type.java +++ /dev/null @@ -1,15 +0,0 @@ -class Holder implements Cloneable, java.io.Serializable {} - -class Type { - private Object myObject; - private Cloneable myCloneable; - private java.io.Serializable mySerializable; - private Holder[] myHolder; - - public void meth(Holder[] p) { - myObject = p; - myCloneable = p; - mySerializable = p; - myHolder = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayRoots2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayRoots2Lvalue/before/Type.java deleted file mode 100644 index 41bb17f7fec2..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayRoots2Lvalue/before/Type.java +++ /dev/null @@ -1,15 +0,0 @@ -class Holder implements Cloneable, java.io.Serializable {} - -class Type { - private Object myObject; - private Cloneable myCloneable; - private java.io.Serializable mySerializable; - private Holder myHolder; - - public void meth(Holder p) { - myObject = p; - myCloneable = p; - mySerializable = p; - myHolder = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2Lvalue/after/Type.items deleted file mode 100644 index 9bcbf6e3ccf2..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2Lvalue/after/Type.items +++ /dev/null @@ -1,13 +0,0 @@ -Types: -PsiField:myDescendants : Subject[] -PsiParameter:p : Subject... -PsiReferenceExpression:myDescendants : Subject[] -PsiReferenceExpression:p : Subject[] -PsiReferenceExpression:p : Subject[] -PsiReferenceExpression:p : Subject[] - -Conversions: -myAncestors -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2Lvalue/after/Type.java deleted file mode 100644 index 82714edc14eb..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2Lvalue/after/Type.java +++ /dev/null @@ -1,15 +0,0 @@ -interface Ancestor {} -interface Subject extends Ancestor {} -class Descendant implements Subject {} - -class Type { - private Ancestor[] myAncestors; - private Subject[] mySubjects; - private Subject[] myDescendants; - - public void meth(Subject... p) { - myAncestors = p; - mySubjects = p; - myDescendants = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2Lvalue/before/Type.java deleted file mode 100644 index 6c0ad8e907ae..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2Lvalue/before/Type.java +++ /dev/null @@ -1,15 +0,0 @@ -interface Ancestor {} -interface Subject extends Ancestor {} -class Descendant implements Subject {} - -class Type { - private Ancestor[] myAncestors; - private Subject[] mySubjects; - private Descendant[] myDescendants; - - public void meth(Descendant[] p) { - myAncestors = p; - mySubjects = p; - myDescendants = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2RvalueNeg/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2RvalueNeg/after/Type.items deleted file mode 100644 index 8e16567f6b52..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2RvalueNeg/after/Type.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiField:myField : Descendant[] -PsiParameter:p : Descendant[] -PsiReferenceExpression:myField : Descendant[] -PsiReferenceExpression:p : Descendant[] - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2RvalueNeg/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2RvalueNeg/after/Type.java deleted file mode 100644 index b14ffa0b66b9..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2RvalueNeg/after/Type.java +++ /dev/null @@ -1,10 +0,0 @@ -interface Ancestor {} -interface Subject extends Ancestor {} -class Descendant implements Subject {} - -class Type { - private Descendant[] myField; - public void meth(Descendant[] p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2RvalueNeg/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2RvalueNeg/before/Type.java deleted file mode 100644 index 299d07095294..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2RvalueNeg/before/Type.java +++ /dev/null @@ -1,10 +0,0 @@ -interface Ancestor {} -interface Subject extends Ancestor {} -class Descendant implements Subject {} - -class Type { - private Ancestor[] myField; - public void meth(Subject... p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2RvaluePos/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2RvaluePos/after/Type.items deleted file mode 100644 index fa58313766a2..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2RvaluePos/after/Type.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiField:myField : Subject[] -PsiReferenceExpression:myField : Subject[] - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2RvaluePos/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2RvaluePos/after/Type.java deleted file mode 100644 index b17f19ce9366..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2RvaluePos/after/Type.java +++ /dev/null @@ -1,10 +0,0 @@ -interface Ancestor {} -interface Subject extends Ancestor {} -class Descendant implements Subject {} - -class Type { - private Subject[] myField; - public void meth(Subject... p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2RvaluePos/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2RvaluePos/before/Type.java deleted file mode 100644 index 299d07095294..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeArrayVararg2RvaluePos/before/Type.java +++ /dev/null @@ -1,10 +0,0 @@ -interface Ancestor {} -interface Subject extends Ancestor {} -class Descendant implements Subject {} - -class Type { - private Ancestor[] myField; - public void meth(Subject... p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxBoolean2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxBoolean2Lvalue/after/Type.items deleted file mode 100644 index d2a5bdf18da5..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxBoolean2Lvalue/after/Type.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiParameter:p : java.lang.Boolean -PsiReferenceExpression:p : java.lang.Boolean -PsiReferenceExpression:p : java.lang.Boolean - -Conversions: -myField -> $ -myFieldSuper3 -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxBoolean2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxBoolean2Lvalue/after/Type.java deleted file mode 100644 index 256ad8ae87ba..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxBoolean2Lvalue/after/Type.java +++ /dev/null @@ -1,8 +0,0 @@ -class Type { - private boolean myField; - private Object myFieldSuper3; - public void meth(Boolean p) { - myField = p; - myFieldSuper3 = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxBoolean2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxBoolean2Lvalue/before/Type.java deleted file mode 100644 index e27196d88750..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxBoolean2Lvalue/before/Type.java +++ /dev/null @@ -1,8 +0,0 @@ -class Type { - private boolean myField; - private Object myFieldSuper3; - public void meth(boolean p) { - myField = p; - myFieldSuper3 = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxBoolean2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxBoolean2Rvalue/after/Type.items deleted file mode 100644 index ddbe17fb4ffc..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxBoolean2Rvalue/after/Type.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:myField : boolean -PsiReferenceExpression:myField : boolean - -Conversions: -p -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxBoolean2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxBoolean2Rvalue/after/Type.java deleted file mode 100644 index d58f3df69336..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxBoolean2Rvalue/after/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private boolean myField; - public void meth(Boolean p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxBoolean2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxBoolean2Rvalue/before/Type.java deleted file mode 100644 index fcfe89fe9eca..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxBoolean2Rvalue/before/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private Boolean myField; - public void meth(Boolean p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxByte2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxByte2Lvalue/after/Type.items deleted file mode 100644 index 1c80a5546782..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxByte2Lvalue/after/Type.items +++ /dev/null @@ -1,15 +0,0 @@ -Types: -PsiParameter:p : java.lang.Byte -PsiReferenceExpression:p : java.lang.Byte -PsiReferenceExpression:p : java.lang.Byte -PsiReferenceExpression:p : java.lang.Byte -PsiReferenceExpression:p : java.lang.Byte - -Conversions: -myField -> $ -myFieldSuper1 -> $ -myFieldSuper2 -> $ -myFieldSuper3 -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxByte2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxByte2Lvalue/after/Type.java deleted file mode 100644 index 40e19f5b4a68..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxByte2Lvalue/after/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private byte myField; - private short myFieldSuper1; - private Number myFieldSuper2; - private Object myFieldSuper3; - public void meth(Byte p) { - myField = p; - myFieldSuper1 = p; - myFieldSuper2 = p; - myFieldSuper3 = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxByte2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxByte2Lvalue/before/Type.java deleted file mode 100644 index c525d82e6f19..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxByte2Lvalue/before/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private byte myField; - private short myFieldSuper1; - private Number myFieldSuper2; - private Object myFieldSuper3; - public void meth(byte p) { - myField = p; - myFieldSuper1 = p; - myFieldSuper2 = p; - myFieldSuper3 = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxByte2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxByte2Rvalue/after/Type.items deleted file mode 100644 index 192b82591e68..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxByte2Rvalue/after/Type.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:myField : byte -PsiReferenceExpression:myField : byte - -Conversions: -p -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxByte2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxByte2Rvalue/after/Type.java deleted file mode 100644 index 435b929c8591..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxByte2Rvalue/after/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private byte myField; - public void meth(Byte p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxByte2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxByte2Rvalue/before/Type.java deleted file mode 100644 index c0c7993580df..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxByte2Rvalue/before/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private Byte myField; - public void meth(Byte p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxChar2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxChar2Lvalue/after/Type.items deleted file mode 100644 index 3499c81915b3..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxChar2Lvalue/after/Type.items +++ /dev/null @@ -1,13 +0,0 @@ -Types: -PsiParameter:p : java.lang.Character -PsiReferenceExpression:p : java.lang.Character -PsiReferenceExpression:p : java.lang.Character -PsiReferenceExpression:p : java.lang.Character - -Conversions: -myField -> $ -myFieldSuper1 -> $ -myFieldSuper3 -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxChar2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxChar2Lvalue/after/Type.java deleted file mode 100644 index c075b5ea1ae1..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxChar2Lvalue/after/Type.java +++ /dev/null @@ -1,10 +0,0 @@ -class Type { - private char myField; - private int myFieldSuper1; - private Object myFieldSuper3; - public void meth(Character p) { - myField = p; - myFieldSuper1 = p; - myFieldSuper3 = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxChar2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxChar2Lvalue/before/Type.java deleted file mode 100644 index c821e8a38b8e..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxChar2Lvalue/before/Type.java +++ /dev/null @@ -1,10 +0,0 @@ -class Type { - private char myField; - private int myFieldSuper1; - private Object myFieldSuper3; - public void meth(char p) { - myField = p; - myFieldSuper1 = p; - myFieldSuper3 = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxChar2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxChar2Rvalue/after/Type.items deleted file mode 100644 index 8f1b31f74f05..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxChar2Rvalue/after/Type.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:myField : char -PsiReferenceExpression:myField : char - -Conversions: -p -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxChar2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxChar2Rvalue/after/Type.java deleted file mode 100644 index bec7b611e95a..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxChar2Rvalue/after/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private char myField; - public void meth(Character p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxChar2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxChar2Rvalue/before/Type.java deleted file mode 100644 index a98d2a5fa05a..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxChar2Rvalue/before/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private Character myField; - public void meth(Character p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxDouble2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxDouble2Lvalue/after/Type.items deleted file mode 100644 index c961b407f293..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxDouble2Lvalue/after/Type.items +++ /dev/null @@ -1,13 +0,0 @@ -Types: -PsiParameter:p : java.lang.Double -PsiReferenceExpression:p : java.lang.Double -PsiReferenceExpression:p : java.lang.Double -PsiReferenceExpression:p : java.lang.Double - -Conversions: -myField -> $ -myFieldSuper2 -> $ -myFieldSuper3 -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxDouble2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxDouble2Lvalue/after/Type.java deleted file mode 100644 index c2cc8485f4f5..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxDouble2Lvalue/after/Type.java +++ /dev/null @@ -1,10 +0,0 @@ -class Type { - private double myField; - private Number myFieldSuper2; - private Object myFieldSuper3; - public void meth(Double p) { - myField = p; - myFieldSuper2 = p; - myFieldSuper3 = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxDouble2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxDouble2Lvalue/before/Type.java deleted file mode 100644 index 56ec2d53eb99..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxDouble2Lvalue/before/Type.java +++ /dev/null @@ -1,10 +0,0 @@ -class Type { - private double myField; - private Number myFieldSuper2; - private Object myFieldSuper3; - public void meth(double p) { - myField = p; - myFieldSuper2 = p; - myFieldSuper3 = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxDouble2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxDouble2Rvalue/after/Type.items deleted file mode 100644 index 2c80921ecfcb..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxDouble2Rvalue/after/Type.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:myField : double -PsiReferenceExpression:myField : double - -Conversions: -p -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxDouble2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxDouble2Rvalue/after/Type.java deleted file mode 100644 index ac0e3c68ebdb..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxDouble2Rvalue/after/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private double myField; - public void meth(Double p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxDouble2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxDouble2Rvalue/before/Type.java deleted file mode 100644 index 4950dcb0d5bd..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxDouble2Rvalue/before/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private Double myField; - public void meth(Double p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxFloat2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxFloat2Lvalue/after/Type.items deleted file mode 100644 index d51dd6bd244e..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxFloat2Lvalue/after/Type.items +++ /dev/null @@ -1,15 +0,0 @@ -Types: -PsiParameter:p : java.lang.Float -PsiReferenceExpression:p : java.lang.Float -PsiReferenceExpression:p : java.lang.Float -PsiReferenceExpression:p : java.lang.Float -PsiReferenceExpression:p : java.lang.Float - -Conversions: -myField -> $ -myFieldSuper1 -> $ -myFieldSuper2 -> $ -myFieldSuper3 -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxFloat2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxFloat2Lvalue/after/Type.java deleted file mode 100644 index 4e06d3369857..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxFloat2Lvalue/after/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private float myField; - private double myFieldSuper1; - private Number myFieldSuper2; - private Object myFieldSuper3; - public void meth(Float p) { - myField = p; - myFieldSuper1 = p; - myFieldSuper2 = p; - myFieldSuper3 = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxFloat2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxFloat2Lvalue/before/Type.java deleted file mode 100644 index 24ec9a945603..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxFloat2Lvalue/before/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private float myField; - private double myFieldSuper1; - private Number myFieldSuper2; - private Object myFieldSuper3; - public void meth(float p) { - myField = p; - myFieldSuper1 = p; - myFieldSuper2 = p; - myFieldSuper3 = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxFloat2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxFloat2Rvalue/after/Type.items deleted file mode 100644 index 1b905928d822..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxFloat2Rvalue/after/Type.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:myField : float -PsiReferenceExpression:myField : float - -Conversions: -p -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxFloat2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxFloat2Rvalue/after/Type.java deleted file mode 100644 index 1db8edb10bed..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxFloat2Rvalue/after/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private float myField; - public void meth(Float p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxFloat2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxFloat2Rvalue/before/Type.java deleted file mode 100644 index 078b103e8df1..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxFloat2Rvalue/before/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private Float myField; - public void meth(Float p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxInt2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxInt2Lvalue/after/Type.items deleted file mode 100644 index 24c52d5796ed..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxInt2Lvalue/after/Type.items +++ /dev/null @@ -1,15 +0,0 @@ -Types: -PsiParameter:p : java.lang.Integer -PsiReferenceExpression:p : java.lang.Integer -PsiReferenceExpression:p : java.lang.Integer -PsiReferenceExpression:p : java.lang.Integer -PsiReferenceExpression:p : java.lang.Integer - -Conversions: -myField -> $ -myFieldSuper1 -> $ -myFieldSuper2 -> $ -myFieldSuper3 -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxInt2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxInt2Lvalue/after/Type.java deleted file mode 100644 index e0075f597b24..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxInt2Lvalue/after/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private int myField; - private long myFieldSuper1; - private Number myFieldSuper2; - private Object myFieldSuper3; - public void meth(Integer p) { - myField = p; - myFieldSuper1 = p; - myFieldSuper2 = p; - myFieldSuper3 = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxInt2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxInt2Lvalue/before/Type.java deleted file mode 100644 index 9c2f74c3f26f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxInt2Lvalue/before/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private int myField; - private long myFieldSuper1; - private Number myFieldSuper2; - private Object myFieldSuper3; - public void meth(int p) { - myField = p; - myFieldSuper1 = p; - myFieldSuper2 = p; - myFieldSuper3 = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxInt2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxInt2Rvalue/after/Type.items deleted file mode 100644 index d95e0af0768c..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxInt2Rvalue/after/Type.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:myField : int -PsiReferenceExpression:myField : int - -Conversions: -p -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxInt2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxInt2Rvalue/after/Type.java deleted file mode 100644 index 4bf28b31788c..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxInt2Rvalue/after/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private int myField; - public void meth(Integer p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxInt2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxInt2Rvalue/before/Type.java deleted file mode 100644 index 87273262b496..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxInt2Rvalue/before/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private Integer myField; - public void meth(Integer p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxLong2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxLong2Lvalue/after/Type.items deleted file mode 100644 index 29939f335f62..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxLong2Lvalue/after/Type.items +++ /dev/null @@ -1,15 +0,0 @@ -Types: -PsiParameter:p : java.lang.Long -PsiReferenceExpression:p : java.lang.Long -PsiReferenceExpression:p : java.lang.Long -PsiReferenceExpression:p : java.lang.Long -PsiReferenceExpression:p : java.lang.Long - -Conversions: -myField -> $ -myFieldSuper1 -> $ -myFieldSuper2 -> $ -myFieldSuper3 -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxLong2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxLong2Lvalue/after/Type.java deleted file mode 100644 index 695801b1bc4f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxLong2Lvalue/after/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private long myField; - private float myFieldSuper1; - private Number myFieldSuper2; - private Object myFieldSuper3; - public void meth(Long p) { - myField = p; - myFieldSuper1 = p; - myFieldSuper2 = p; - myFieldSuper3 = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxLong2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxLong2Lvalue/before/Type.java deleted file mode 100644 index c6a909f7c46a..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxLong2Lvalue/before/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private long myField; - private float myFieldSuper1; - private Number myFieldSuper2; - private Object myFieldSuper3; - public void meth(long p) { - myField = p; - myFieldSuper1 = p; - myFieldSuper2 = p; - myFieldSuper3 = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxLong2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxLong2Rvalue/after/Type.items deleted file mode 100644 index 0fa3e3feb520..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxLong2Rvalue/after/Type.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:myField : long -PsiReferenceExpression:myField : long - -Conversions: -p -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxLong2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxLong2Rvalue/after/Type.java deleted file mode 100644 index 6f407a2591a1..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxLong2Rvalue/after/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private long myField; - public void meth(Long p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxLong2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxLong2Rvalue/before/Type.java deleted file mode 100644 index ceceb07caa8e..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxLong2Rvalue/before/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private Long myField; - public void meth(Long p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxShort2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxShort2Lvalue/after/Type.items deleted file mode 100644 index c6a4cc9b70c8..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxShort2Lvalue/after/Type.items +++ /dev/null @@ -1,15 +0,0 @@ -Types: -PsiParameter:p : java.lang.Short -PsiReferenceExpression:p : java.lang.Short -PsiReferenceExpression:p : java.lang.Short -PsiReferenceExpression:p : java.lang.Short -PsiReferenceExpression:p : java.lang.Short - -Conversions: -myField -> $ -myFieldSuper1 -> $ -myFieldSuper2 -> $ -myFieldSuper3 -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxShort2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxShort2Lvalue/after/Type.java deleted file mode 100644 index 50d61183a785..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxShort2Lvalue/after/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private short myField; - private int myFieldSuper1; - private Number myFieldSuper2; - private Object myFieldSuper3; - public void meth(Short p) { - myField = p; - myFieldSuper1 = p; - myFieldSuper2 = p; - myFieldSuper3 = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxShort2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxShort2Lvalue/before/Type.java deleted file mode 100644 index 52eb7aa5b30c..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxShort2Lvalue/before/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private short myField; - private int myFieldSuper1; - private Number myFieldSuper2; - private Object myFieldSuper3; - public void meth(short p) { - myField = p; - myFieldSuper1 = p; - myFieldSuper2 = p; - myFieldSuper3 = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxShort2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxShort2Rvalue/after/Type.items deleted file mode 100644 index 28ba15701be6..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxShort2Rvalue/after/Type.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:myField : short -PsiReferenceExpression:myField : short - -Conversions: -p -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxShort2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxShort2Rvalue/after/Type.java deleted file mode 100644 index ba146982c723..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxShort2Rvalue/after/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private short myField; - public void meth(Short p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxShort2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxShort2Rvalue/before/Type.java deleted file mode 100644 index 9ca0f4947260..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeAutoboxShort2Rvalue/before/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private Short myField; - public void meth(Short p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenAncestor2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenAncestor2Lvalue/after/Type.items deleted file mode 100644 index 6106a705cdd8..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenAncestor2Lvalue/after/Type.items +++ /dev/null @@ -1,33 +0,0 @@ -Types: -PsiField:myAncestorSupers : java.util.Set<Subject> -PsiField:myAncestors : java.util.Set<Subject> -PsiField:myCollection : java.util.Collection<Subject> -PsiField:myDescendantExtends : java.util.Set<Subject> -PsiField:myDescendants : java.util.Set<Subject> -PsiParameter:p : java.util.Set<Subject> -PsiReferenceExpression:myAncestorSupers : java.util.Set<Subject> -PsiReferenceExpression:myAncestors : java.util.Set<Subject> -PsiReferenceExpression:myCollection : java.util.Collection<Subject> -PsiReferenceExpression:myDescendantExtends : java.util.Set<Subject> -PsiReferenceExpression:myDescendants : java.util.Set<Subject> -PsiReferenceExpression:p : java.util.Set<Subject> -PsiReferenceExpression:p : java.util.Set<Subject> -PsiReferenceExpression:p : java.util.Set<Subject> -PsiReferenceExpression:p : java.util.Set<Subject> -PsiReferenceExpression:p : java.util.Set<Subject> -PsiReferenceExpression:p : java.util.Set<Subject> -PsiReferenceExpression:p : java.util.Set<Subject> -PsiReferenceExpression:p : java.util.Set<Subject> -PsiReferenceExpression:p : java.util.Set<Subject> -PsiReferenceExpression:p : java.util.Set<Subject> -PsiReferenceExpression:p : java.util.Set<Subject> - -Conversions: -myAncestorExtends -> $ -myDescendantSupers -> $ -mySet -> $ -mySubjectExtends -> $ -mySubjectSupers -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenAncestor2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenAncestor2Lvalue/after/Type.java deleted file mode 100644 index 7e3eeb9770ca..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenAncestor2Lvalue/after/Type.java +++ /dev/null @@ -1,40 +0,0 @@ -import java.util.Collection; -import java.util.Set; - -interface Ancestor {} -interface Subject extends Ancestor {} -class Descendant implements Subject {} - -class Type { - private Set<Subject> myAncestors; - private Set<? extends Ancestor> myAncestorExtends; - private Set<Subject> myAncestorSupers; - - private Set<Subject> mySubjects; - private Set<? extends Subject> mySubjectExtends; - private Set<? super Subject> mySubjectSupers; - - private Set<Subject> myDescendants; - private Set<Subject> myDescendantExtends; - private Set<? super Descendant> myDescendantSupers; - - private Set mySet; - private Collection<Subject> myCollection; - - public void meth(Set<Subject> p) { - myAncestors = p; - myAncestorExtends = p; - myAncestorSupers = p; - - mySubjects = p; - mySubjectExtends = p; - mySubjectSupers = p; - - myDescendants = p; - myDescendantExtends = p; - myDescendantSupers = p; - - mySet = p; - myCollection = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenAncestor2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenAncestor2Lvalue/before/Type.java deleted file mode 100644 index 2e63240580ca..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenAncestor2Lvalue/before/Type.java +++ /dev/null @@ -1,40 +0,0 @@ -import java.util.Collection; -import java.util.Set; - -interface Ancestor {} -interface Subject extends Ancestor {} -class Descendant implements Subject {} - -class Type { - private Set<Ancestor> myAncestors; - private Set<? extends Ancestor> myAncestorExtends; - private Set<? super Ancestor> myAncestorSupers; - - private Set<Subject> mySubjects; - private Set<? extends Subject> mySubjectExtends; - private Set<? super Subject> mySubjectSupers; - - private Set<Descendant> myDescendants; - private Set<? extends Descendant> myDescendantExtends; - private Set<? super Descendant> myDescendantSupers; - - private Set mySet; - private Collection<Ancestor> myCollection; - - public void meth(Set p) { - myAncestors = p; - myAncestorExtends = p; - myAncestorSupers = p; - - mySubjects = p; - mySubjectExtends = p; - mySubjectSupers = p; - - myDescendants = p; - myDescendantExtends = p; - myDescendantSupers = p; - - mySet = p; - myCollection = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenAncestorWildcard2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenAncestorWildcard2Lvalue/after/Type.items deleted file mode 100644 index 6cb2f2be0d34..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenAncestorWildcard2Lvalue/after/Type.items +++ /dev/null @@ -1,33 +0,0 @@ -Types: -PsiField:myAncestorSupers : java.util.Set<? extends Subject> -PsiField:myAncestors : java.util.Set<? extends Subject> -PsiField:myDescendantExtends : java.util.Set<? extends Subject> -PsiField:myDescendantSupers : java.util.Set<? extends Subject> -PsiField:myDescendants : java.util.Set<? extends Subject> -PsiField:mySubjectSupers : java.util.Set<? extends Subject> -PsiField:mySubjects : java.util.Set<? extends Subject> -PsiParameter:p : java.util.Set<? extends Subject> -PsiReferenceExpression:myAncestorSupers : java.util.Set<? extends Subject> -PsiReferenceExpression:myAncestors : java.util.Set<? extends Subject> -PsiReferenceExpression:myDescendantExtends : java.util.Set<? extends Subject> -PsiReferenceExpression:myDescendantSupers : java.util.Set<? extends Subject> -PsiReferenceExpression:myDescendants : java.util.Set<? extends Subject> -PsiReferenceExpression:mySubjectSupers : java.util.Set<? extends Subject> -PsiReferenceExpression:mySubjects : java.util.Set<? extends Subject> -PsiReferenceExpression:p : java.util.Set<? extends Subject> -PsiReferenceExpression:p : java.util.Set<? extends Subject> -PsiReferenceExpression:p : java.util.Set<? extends Subject> -PsiReferenceExpression:p : java.util.Set<? extends Subject> -PsiReferenceExpression:p : java.util.Set<? extends Subject> -PsiReferenceExpression:p : java.util.Set<? extends Subject> -PsiReferenceExpression:p : java.util.Set<? extends Subject> -PsiReferenceExpression:p : java.util.Set<? extends Subject> -PsiReferenceExpression:p : java.util.Set<? extends Subject> -PsiReferenceExpression:p : java.util.Set<? extends Subject> - -Conversions: -myAncestorExtends -> $ -mySet -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenAncestorWildcard2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenAncestorWildcard2Lvalue/after/Type.java deleted file mode 100644 index 2ffef9b4e9ad..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenAncestorWildcard2Lvalue/after/Type.java +++ /dev/null @@ -1,37 +0,0 @@ -import java.util.Set; - -interface Ancestor {} -interface Subject extends Ancestor {} -class Descendant implements Subject {} - -class Type { - private Set<? extends Subject> myAncestors; - private Set<? extends Ancestor> myAncestorExtends; - private Set<? extends Subject> myAncestorSupers; - - private Set<? extends Subject> mySubjects; - private Set<? extends Subject> mySubjectExtends; - private Set<? extends Subject> mySubjectSupers; - - private Set<? extends Subject> myDescendants; - private Set<? extends Subject> myDescendantExtends; - private Set<? extends Subject> myDescendantSupers; - - private Set mySet; - - public void meth(Set<? extends Subject> p) { - myAncestors = p; - myAncestorExtends = p; - myAncestorSupers = p; - - mySubjects = p; - mySubjectExtends = p; - mySubjectSupers = p; - - myDescendants = p; - myDescendantExtends = p; - myDescendantSupers = p; - - mySet = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenAncestorWildcard2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenAncestorWildcard2Lvalue/before/Type.java deleted file mode 100644 index 4fc8d5baf167..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenAncestorWildcard2Lvalue/before/Type.java +++ /dev/null @@ -1,37 +0,0 @@ -import java.util.Set; - -interface Ancestor {} -interface Subject extends Ancestor {} -class Descendant implements Subject {} - -class Type { - private Set<Ancestor> myAncestors; - private Set<? extends Ancestor> myAncestorExtends; - private Set<? super Ancestor> myAncestorSupers; - - private Set<Subject> mySubjects; - private Set<? extends Subject> mySubjectExtends; - private Set<? super Subject> mySubjectSupers; - - private Set<Descendant> myDescendants; - private Set<? extends Descendant> myDescendantExtends; - private Set<? super Descendant> myDescendantSupers; - - private Set mySet; - - public void meth(Set p) { - myAncestors = p; - myAncestorExtends = p; - myAncestorSupers = p; - - mySubjects = p; - mySubjectExtends = p; - mySubjectSupers = p; - - myDescendants = p; - myDescendantExtends = p; - myDescendantSupers = p; - - mySet = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenDescendant2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenDescendant2Rvalue/after/Type.items deleted file mode 100644 index ab6a62095446..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenDescendant2Rvalue/after/Type.items +++ /dev/null @@ -1,37 +0,0 @@ -Types: -PsiField:myField : java.util.Set<Subject> -PsiLocalVariable:ancestorExtends : java.util.Set<Subject> -PsiLocalVariable:ancestorSupers : java.util.Set<Subject> -PsiLocalVariable:ancestors : java.util.Set<Subject> -PsiLocalVariable:descendantExtends : java.util.Set<Subject> -PsiLocalVariable:descendantSupers : java.util.Set<Subject> -PsiLocalVariable:descendants : java.util.Set<Subject> -PsiLocalVariable:myCollection : java.util.AbstractSet<Subject> -PsiLocalVariable:subjectExtends : java.util.Set<Subject> -PsiLocalVariable:subjectSupers : java.util.Set<Subject> -PsiReferenceExpression:ancestorExtends : java.util.Set<Subject> -PsiReferenceExpression:ancestorSupers : java.util.Set<Subject> -PsiReferenceExpression:ancestors : java.util.Set<Subject> -PsiReferenceExpression:descendantExtends : java.util.Set<Subject> -PsiReferenceExpression:descendantSupers : java.util.Set<Subject> -PsiReferenceExpression:descendants : java.util.Set<Subject> -PsiReferenceExpression:myCollection : java.util.AbstractSet<Subject> -PsiReferenceExpression:myField : java.util.Set<Subject> -PsiReferenceExpression:myField : java.util.Set<Subject> -PsiReferenceExpression:myField : java.util.Set<Subject> -PsiReferenceExpression:myField : java.util.Set<Subject> -PsiReferenceExpression:myField : java.util.Set<Subject> -PsiReferenceExpression:myField : java.util.Set<Subject> -PsiReferenceExpression:myField : java.util.Set<Subject> -PsiReferenceExpression:myField : java.util.Set<Subject> -PsiReferenceExpression:myField : java.util.Set<Subject> -PsiReferenceExpression:myField : java.util.Set<Subject> -PsiReferenceExpression:myField : java.util.Set<Subject> -PsiReferenceExpression:subjectExtends : java.util.Set<Subject> -PsiReferenceExpression:subjectSupers : java.util.Set<Subject> - -Conversions: -set -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenDescendant2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenDescendant2Rvalue/after/Type.java deleted file mode 100644 index 119e65ca61b5..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenDescendant2Rvalue/after/Type.java +++ /dev/null @@ -1,39 +0,0 @@ -import java.util.AbstractSet; -import java.util.Set; - -interface Ancestor {} -interface Subject extends Ancestor {} -class Descendant implements Subject {} - -class Type { - private Set<Subject> myField; - - public void meth() { - Set<Subject> ancestors = null; - myField = ancestors; - Set<Subject> ancestorExtends = null; - myField = ancestorExtends; - Set<Subject> ancestorSupers = null; - myField = ancestorSupers; - - // turning everything into Set<Subject> is actually too strict, but correct - Set<Subject> subjects = null; - myField = subjects; - Set<Subject> subjectExtends = null; - myField = subjectExtends; - Set<Subject> subjectSupers = null; - myField = subjectSupers; - - Set<Subject> descendants = null; - myField = descendants; - Set<Subject> descendantExtends = null; - myField = descendantExtends; - Set<Subject> descendantSupers = null; - myField = descendantSupers; - - Set set = null; - myField = set; - AbstractSet<Subject> myCollection = null; - myField = myCollection; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenDescendant2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenDescendant2Rvalue/before/Type.java deleted file mode 100644 index e53aa1d3cd1b..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenDescendant2Rvalue/before/Type.java +++ /dev/null @@ -1,39 +0,0 @@ -import java.util.AbstractSet; -import java.util.Set; - -interface Ancestor {} -interface Subject extends Ancestor {} -class Descendant implements Subject {} - -class Type { - private Set myField; - - public void meth() { - Set<Ancestor> ancestors = null; - myField = ancestors; - Set<? extends Ancestor> ancestorExtends = null; - myField = ancestorExtends; - Set<? super Ancestor> ancestorSupers = null; - myField = ancestorSupers; - - // turning everything into Set<Subject> is actually too strict, but correct - Set<Subject> subjects = null; - myField = subjects; - Set<? extends Subject> subjectExtends = null; - myField = subjectExtends; - Set<? super Subject> subjectSupers = null; - myField = subjectSupers; - - Set<Descendant> descendants = null; - myField = descendants; - Set<? extends Descendant> descendantExtends = null; - myField = descendantExtends; - Set<? super Descendant> descendantSupers = null; - myField = descendantSupers; - - Set set = null; - myField = set; - AbstractSet<Descendant> myCollection = null; - myField = myCollection; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenDescendantWildcard2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenDescendantWildcard2Rvalue/after/Type.items deleted file mode 100644 index e34aedf887d3..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenDescendantWildcard2Rvalue/after/Type.items +++ /dev/null @@ -1,32 +0,0 @@ -Types: -PsiField:myField : java.util.Set<? super Subject> -PsiLocalVariable:ancestorExtends : java.util.Set<? super Subject> -PsiLocalVariable:descendantExtends : java.util.Set<? super Subject> -PsiLocalVariable:descendantSupers : java.util.Set<? super Subject> -PsiLocalVariable:descendants : java.util.Set<? super Subject> -PsiLocalVariable:subjectExtends : java.util.Set<? super Subject> -PsiReferenceExpression:ancestorExtends : java.util.Set<? super Subject> -PsiReferenceExpression:descendantExtends : java.util.Set<? super Subject> -PsiReferenceExpression:descendantSupers : java.util.Set<? super Subject> -PsiReferenceExpression:descendants : java.util.Set<? super Subject> -PsiReferenceExpression:myField : java.util.Set<? super Subject> -PsiReferenceExpression:myField : java.util.Set<? super Subject> -PsiReferenceExpression:myField : java.util.Set<? super Subject> -PsiReferenceExpression:myField : java.util.Set<? super Subject> -PsiReferenceExpression:myField : java.util.Set<? super Subject> -PsiReferenceExpression:myField : java.util.Set<? super Subject> -PsiReferenceExpression:myField : java.util.Set<? super Subject> -PsiReferenceExpression:myField : java.util.Set<? super Subject> -PsiReferenceExpression:myField : java.util.Set<? super Subject> -PsiReferenceExpression:myField : java.util.Set<? super Subject> -PsiReferenceExpression:subjectExtends : java.util.Set<? super Subject> - -Conversions: -ancestorSupers -> $ -ancestors -> $ -set -> $ -subjectSupers -> $ -subjects -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenDescendantWildcard2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenDescendantWildcard2Rvalue/after/Type.java deleted file mode 100644 index a0982c89aa5c..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenDescendantWildcard2Rvalue/after/Type.java +++ /dev/null @@ -1,35 +0,0 @@ -import java.util.Set; - -interface Ancestor {} -interface Subject extends Ancestor {} -class Descendant implements Subject {} - -class Type { - private Set<? super Subject> myField; - - public void meth() { - Set<Ancestor> ancestors = null; - myField = ancestors; - Set<? super Subject> ancestorExtends = null; - myField = ancestorExtends; - Set<? super Ancestor> ancestorSupers = null; - myField = ancestorSupers; - - Set<Subject> subjects = null; - myField = subjects; - Set<? super Subject> subjectExtends = null; - myField = subjectExtends; - Set<? super Subject> subjectSupers = null; - myField = subjectSupers; - - Set<? super Subject> descendants = null; - myField = descendants; - Set<? super Subject> descendantExtends = null; - myField = descendantExtends; - Set<? super Subject> descendantSupers = null; - myField = descendantSupers; - - Set set = null; - myField = set; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenDescendantWildcard2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenDescendantWildcard2Rvalue/before/Type.java deleted file mode 100644 index 79f4d219b47c..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenDescendantWildcard2Rvalue/before/Type.java +++ /dev/null @@ -1,35 +0,0 @@ -import java.util.Set; - -interface Ancestor {} -interface Subject extends Ancestor {} -class Descendant implements Subject {} - -class Type { - private Set myField; - - public void meth() { - Set<Ancestor> ancestors = null; - myField = ancestors; - Set<? extends Ancestor> ancestorExtends = null; - myField = ancestorExtends; - Set<? super Ancestor> ancestorSupers = null; - myField = ancestorSupers; - - Set<Subject> subjects = null; - myField = subjects; - Set<? extends Subject> subjectExtends = null; - myField = subjectExtends; - Set<? super Subject> subjectSupers = null; - myField = subjectSupers; - - Set<Descendant> descendants = null; - myField = descendants; - Set<? extends Descendant> descendantExtends = null; - myField = descendantExtends; - Set<? super Descendant> descendantSupers = null; - myField = descendantSupers; - - Set set = null; - myField = set; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenRaw2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenRaw2Lvalue/after/Type.items deleted file mode 100644 index 9da02a3b248c..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenRaw2Lvalue/after/Type.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:p : java.util.Set -PsiReferenceExpression:p : java.util.Set - -Conversions: -myField -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenRaw2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenRaw2Lvalue/after/Type.java deleted file mode 100644 index f66a7c1fadc0..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenRaw2Lvalue/after/Type.java +++ /dev/null @@ -1,10 +0,0 @@ -import java.util.Set; - -class Any {} - -class Type { - private Set<Any> myField; - public void meth(Set p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenRaw2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenRaw2Lvalue/before/Type.java deleted file mode 100644 index 968d7e85e0b7..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenRaw2Lvalue/before/Type.java +++ /dev/null @@ -1,10 +0,0 @@ -import java.util.Set; - -class Any {} - -class Type { - private Set<Any> myField; - public void meth(Set<Any> p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenRaw2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenRaw2Rvalue/after/Type.items deleted file mode 100644 index a3dd46449c57..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenRaw2Rvalue/after/Type.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:myField : java.util.Set -PsiReferenceExpression:myField : java.util.Set - -Conversions: -p -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenRaw2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenRaw2Rvalue/after/Type.java deleted file mode 100644 index f78a0b3d5a68..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenRaw2Rvalue/after/Type.java +++ /dev/null @@ -1,10 +0,0 @@ -import java.util.Set; - -class Any {} - -class Type { - private Set myField; - public void meth(Set<Any> p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenRaw2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenRaw2Rvalue/before/Type.java deleted file mode 100644 index 968d7e85e0b7..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeGenRaw2Rvalue/before/Type.java +++ /dev/null @@ -1,10 +0,0 @@ -import java.util.Set; - -class Any {} - -class Type { - private Set<Any> myField; - public void meth(Set<Any> p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubBoolean2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubBoolean2Lvalue/after/Type.items deleted file mode 100644 index 361d3837f2da..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubBoolean2Lvalue/after/Type.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiField:myField : boolean -PsiParameter:p : boolean -PsiReferenceExpression:myField : boolean -PsiReferenceExpression:p : boolean - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubBoolean2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubBoolean2Lvalue/after/Type.java deleted file mode 100644 index 8a5b062df2e6..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubBoolean2Lvalue/after/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private boolean myField; - public void meth(boolean p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubBoolean2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubBoolean2Lvalue/before/Type.java deleted file mode 100644 index b9185a0c81ed..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubBoolean2Lvalue/before/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private int myField; - public void meth(int p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubBoolean2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubBoolean2Rvalue/after/Type.items deleted file mode 100644 index 361d3837f2da..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubBoolean2Rvalue/after/Type.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiField:myField : boolean -PsiParameter:p : boolean -PsiReferenceExpression:myField : boolean -PsiReferenceExpression:p : boolean - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubBoolean2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubBoolean2Rvalue/after/Type.java deleted file mode 100644 index 8a5b062df2e6..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubBoolean2Rvalue/after/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private boolean myField; - public void meth(boolean p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubBoolean2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubBoolean2Rvalue/before/Type.java deleted file mode 100644 index b9185a0c81ed..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubBoolean2Rvalue/before/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -class Type { - private int myField; - public void meth(int p) { - myField = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubByte2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubByte2Rvalue/after/Type.items deleted file mode 100644 index 71e76cc5a1e9..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubByte2Rvalue/after/Type.items +++ /dev/null @@ -1,26 +0,0 @@ -Types: -PsiField:myField : byte -PsiParameter:pc : byte -PsiParameter:pd : byte -PsiParameter:pf : byte -PsiParameter:pi : byte -PsiParameter:pl : byte -PsiParameter:ps : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:myField : byte -PsiReferenceExpression:pc : byte -PsiReferenceExpression:pd : byte -PsiReferenceExpression:pf : byte -PsiReferenceExpression:pi : byte -PsiReferenceExpression:pl : byte -PsiReferenceExpression:ps : byte - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubByte2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubByte2Rvalue/after/Type.java deleted file mode 100644 index ac3a40879f5b..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubByte2Rvalue/after/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private byte myField; - public void meth(byte pb, byte ps, byte pc, byte pi, byte pl, byte pf, byte pd) { - myField = pb; - myField = ps; - myField = pc; - myField = pi; - myField = pl; - myField = pf; - myField = pd; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubByte2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubByte2Rvalue/before/Type.java deleted file mode 100644 index f7edce2eea98..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubByte2Rvalue/before/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private double myField; - public void meth(byte pb, short ps, char pc, int pi, long pl, float pf, double pd) { - myField = pb; - myField = ps; - myField = pc; - myField = pi; - myField = pl; - myField = pf; - myField = pd; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubChar2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubChar2Lvalue/after/Type.items deleted file mode 100644 index 521321c601c1..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubChar2Lvalue/after/Type.items +++ /dev/null @@ -1,22 +0,0 @@ -Types: -PsiField:myByte : char -PsiField:myShort : char -PsiParameter:p : char -PsiReferenceExpression:myByte : char -PsiReferenceExpression:myShort : char -PsiReferenceExpression:p : char -PsiReferenceExpression:p : char -PsiReferenceExpression:p : char -PsiReferenceExpression:p : char -PsiReferenceExpression:p : char -PsiReferenceExpression:p : char -PsiReferenceExpression:p : char - -Conversions: -myDouble -> $ -myFloat -> $ -myInt -> $ -myLong -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubChar2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubChar2Lvalue/after/Type.java deleted file mode 100644 index 8b94e45d5626..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubChar2Lvalue/after/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -class Type { - private char myByte; - private char myShort; - private char myChar; - private int myInt; - private long myLong; - private float myFloat; - private double myDouble; - public void meth(char p) { - myByte = p; - myShort = p; - myChar = p; - myInt = p; - myLong = p; - myFloat = p; - myDouble = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubChar2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubChar2Lvalue/before/Type.java deleted file mode 100644 index 2d55ceaa511a..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubChar2Lvalue/before/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -class Type { - private byte myByte; - private short myShort; - private char myChar; - private int myInt; - private long myLong; - private float myFloat; - private double myDouble; - public void meth(byte p) { - myByte = p; - myShort = p; - myChar = p; - myInt = p; - myLong = p; - myFloat = p; - myDouble = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubChar2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubChar2Rvalue/after/Type.items deleted file mode 100644 index 404f84f33867..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubChar2Rvalue/after/Type.items +++ /dev/null @@ -1,26 +0,0 @@ -Types: -PsiField:myField : char -PsiParameter:pb : char -PsiParameter:pd : char -PsiParameter:pf : char -PsiParameter:pi : char -PsiParameter:pl : char -PsiParameter:ps : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:myField : char -PsiReferenceExpression:pb : char -PsiReferenceExpression:pd : char -PsiReferenceExpression:pf : char -PsiReferenceExpression:pi : char -PsiReferenceExpression:pl : char -PsiReferenceExpression:ps : char - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubChar2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubChar2Rvalue/after/Type.java deleted file mode 100644 index dc346a77074c..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubChar2Rvalue/after/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private char myField; - public void meth(char pb, char ps, char pc, char pi, char pl, char pf, char pd) { - myField = pb; - myField = ps; - myField = pc; - myField = pi; - myField = pl; - myField = pf; - myField = pd; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubChar2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubChar2Rvalue/before/Type.java deleted file mode 100644 index f7edce2eea98..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubChar2Rvalue/before/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private double myField; - public void meth(byte pb, short ps, char pc, int pi, long pl, float pf, double pd) { - myField = pb; - myField = ps; - myField = pc; - myField = pi; - myField = pl; - myField = pf; - myField = pd; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubDouble2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubDouble2Lvalue/after/Type.items deleted file mode 100644 index 6946fcefbac0..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubDouble2Lvalue/after/Type.items +++ /dev/null @@ -1,26 +0,0 @@ -Types: -PsiField:myByte : double -PsiField:myChar : double -PsiField:myFloat : double -PsiField:myInt : double -PsiField:myLong : double -PsiField:myShort : double -PsiParameter:p : double -PsiReferenceExpression:myByte : double -PsiReferenceExpression:myChar : double -PsiReferenceExpression:myFloat : double -PsiReferenceExpression:myInt : double -PsiReferenceExpression:myLong : double -PsiReferenceExpression:myShort : double -PsiReferenceExpression:p : double -PsiReferenceExpression:p : double -PsiReferenceExpression:p : double -PsiReferenceExpression:p : double -PsiReferenceExpression:p : double -PsiReferenceExpression:p : double -PsiReferenceExpression:p : double - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubDouble2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubDouble2Lvalue/after/Type.java deleted file mode 100644 index 8a5035c81e4d..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubDouble2Lvalue/after/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -class Type { - private double myByte; - private double myShort; - private double myChar; - private double myInt; - private double myLong; - private double myFloat; - private double myDouble; - public void meth(double p) { - myByte = p; - myShort = p; - myChar = p; - myInt = p; - myLong = p; - myFloat = p; - myDouble = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubDouble2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubDouble2Lvalue/before/Type.java deleted file mode 100644 index 2d55ceaa511a..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubDouble2Lvalue/before/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -class Type { - private byte myByte; - private short myShort; - private char myChar; - private int myInt; - private long myLong; - private float myFloat; - private double myDouble; - public void meth(byte p) { - myByte = p; - myShort = p; - myChar = p; - myInt = p; - myLong = p; - myFloat = p; - myDouble = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubFloat2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubFloat2Lvalue/after/Type.items deleted file mode 100644 index c479836287e0..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubFloat2Lvalue/after/Type.items +++ /dev/null @@ -1,25 +0,0 @@ -Types: -PsiField:myByte : float -PsiField:myChar : float -PsiField:myInt : float -PsiField:myLong : float -PsiField:myShort : float -PsiParameter:p : float -PsiReferenceExpression:myByte : float -PsiReferenceExpression:myChar : float -PsiReferenceExpression:myInt : float -PsiReferenceExpression:myLong : float -PsiReferenceExpression:myShort : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float - -Conversions: -myDouble -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubFloat2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubFloat2Lvalue/after/Type.java deleted file mode 100644 index 8b59184de85f..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubFloat2Lvalue/after/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -class Type { - private float myByte; - private float myShort; - private float myChar; - private float myInt; - private float myLong; - private float myFloat; - private double myDouble; - public void meth(float p) { - myByte = p; - myShort = p; - myChar = p; - myInt = p; - myLong = p; - myFloat = p; - myDouble = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubFloat2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubFloat2Lvalue/before/Type.java deleted file mode 100644 index 2d55ceaa511a..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubFloat2Lvalue/before/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -class Type { - private byte myByte; - private short myShort; - private char myChar; - private int myInt; - private long myLong; - private float myFloat; - private double myDouble; - public void meth(byte p) { - myByte = p; - myShort = p; - myChar = p; - myInt = p; - myLong = p; - myFloat = p; - myDouble = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubFloat2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubFloat2Rvalue/after/Type.items deleted file mode 100644 index 7a22f6771caf..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubFloat2Rvalue/after/Type.items +++ /dev/null @@ -1,21 +0,0 @@ -Types: -PsiField:myField : float -PsiParameter:pd : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:myField : float -PsiReferenceExpression:pd : float - -Conversions: -pb -> $ -pc -> $ -pi -> $ -pl -> $ -ps -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubFloat2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubFloat2Rvalue/after/Type.java deleted file mode 100644 index 0b933cce77dd..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubFloat2Rvalue/after/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private float myField; - public void meth(byte pb, short ps, char pc, int pi, long pl, float pf, float pd) { - myField = pb; - myField = ps; - myField = pc; - myField = pi; - myField = pl; - myField = pf; - myField = pd; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubFloat2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubFloat2Rvalue/before/Type.java deleted file mode 100644 index f7edce2eea98..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubFloat2Rvalue/before/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private double myField; - public void meth(byte pb, short ps, char pc, int pi, long pl, float pf, double pd) { - myField = pb; - myField = ps; - myField = pc; - myField = pi; - myField = pl; - myField = pf; - myField = pd; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubInt2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubInt2Lvalue/after/Type.items deleted file mode 100644 index 200b3b8b3fb5..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubInt2Lvalue/after/Type.items +++ /dev/null @@ -1,23 +0,0 @@ -Types: -PsiField:myByte : int -PsiField:myChar : int -PsiField:myShort : int -PsiParameter:p : int -PsiReferenceExpression:myByte : int -PsiReferenceExpression:myChar : int -PsiReferenceExpression:myShort : int -PsiReferenceExpression:p : int -PsiReferenceExpression:p : int -PsiReferenceExpression:p : int -PsiReferenceExpression:p : int -PsiReferenceExpression:p : int -PsiReferenceExpression:p : int -PsiReferenceExpression:p : int - -Conversions: -myDouble -> $ -myFloat -> $ -myLong -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubInt2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubInt2Lvalue/after/Type.java deleted file mode 100644 index b15830da724d..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubInt2Lvalue/after/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -class Type { - private int myByte; - private int myShort; - private int myChar; - private int myInt; - private long myLong; - private float myFloat; - private double myDouble; - public void meth(int p) { - myByte = p; - myShort = p; - myChar = p; - myInt = p; - myLong = p; - myFloat = p; - myDouble = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubInt2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubInt2Lvalue/before/Type.java deleted file mode 100644 index 2d55ceaa511a..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubInt2Lvalue/before/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -class Type { - private byte myByte; - private short myShort; - private char myChar; - private int myInt; - private long myLong; - private float myFloat; - private double myDouble; - public void meth(byte p) { - myByte = p; - myShort = p; - myChar = p; - myInt = p; - myLong = p; - myFloat = p; - myDouble = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubInt2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubInt2Rvalue/after/Type.items deleted file mode 100644 index b7c45d6a6aff..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubInt2Rvalue/after/Type.items +++ /dev/null @@ -1,23 +0,0 @@ -Types: -PsiField:myField : int -PsiParameter:pd : int -PsiParameter:pf : int -PsiParameter:pl : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:myField : int -PsiReferenceExpression:pd : int -PsiReferenceExpression:pf : int -PsiReferenceExpression:pl : int - -Conversions: -pb -> $ -pc -> $ -ps -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubInt2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubInt2Rvalue/after/Type.java deleted file mode 100644 index c13b0ab9bee2..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubInt2Rvalue/after/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private int myField; - public void meth(byte pb, short ps, char pc, int pi, int pl, int pf, int pd) { - myField = pb; - myField = ps; - myField = pc; - myField = pi; - myField = pl; - myField = pf; - myField = pd; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubInt2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubInt2Rvalue/before/Type.java deleted file mode 100644 index f7edce2eea98..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubInt2Rvalue/before/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private double myField; - public void meth(byte pb, short ps, char pc, int pi, long pl, float pf, double pd) { - myField = pb; - myField = ps; - myField = pc; - myField = pi; - myField = pl; - myField = pf; - myField = pd; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubLong2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubLong2Lvalue/after/Type.items deleted file mode 100644 index 3f94bd20c6e8..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubLong2Lvalue/after/Type.items +++ /dev/null @@ -1,24 +0,0 @@ -Types: -PsiField:myByte : long -PsiField:myChar : long -PsiField:myInt : long -PsiField:myShort : long -PsiParameter:p : long -PsiReferenceExpression:myByte : long -PsiReferenceExpression:myChar : long -PsiReferenceExpression:myInt : long -PsiReferenceExpression:myShort : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long -PsiReferenceExpression:p : long - -Conversions: -myDouble -> $ -myFloat -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubLong2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubLong2Lvalue/after/Type.java deleted file mode 100644 index 1b594666283c..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubLong2Lvalue/after/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -class Type { - private long myByte; - private long myShort; - private long myChar; - private long myInt; - private long myLong; - private float myFloat; - private double myDouble; - public void meth(long p) { - myByte = p; - myShort = p; - myChar = p; - myInt = p; - myLong = p; - myFloat = p; - myDouble = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubLong2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubLong2Lvalue/before/Type.java deleted file mode 100644 index 2d55ceaa511a..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubLong2Lvalue/before/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -class Type { - private byte myByte; - private short myShort; - private char myChar; - private int myInt; - private long myLong; - private float myFloat; - private double myDouble; - public void meth(byte p) { - myByte = p; - myShort = p; - myChar = p; - myInt = p; - myLong = p; - myFloat = p; - myDouble = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubLong2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubLong2Rvalue/after/Type.items deleted file mode 100644 index 98a3c92987b9..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubLong2Rvalue/after/Type.items +++ /dev/null @@ -1,22 +0,0 @@ -Types: -PsiField:myField : long -PsiParameter:pd : long -PsiParameter:pf : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:myField : long -PsiReferenceExpression:pd : long -PsiReferenceExpression:pf : long - -Conversions: -pb -> $ -pc -> $ -pi -> $ -ps -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubLong2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubLong2Rvalue/after/Type.java deleted file mode 100644 index e3e3b25d89b4..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubLong2Rvalue/after/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private long myField; - public void meth(byte pb, short ps, char pc, int pi, long pl, long pf, long pd) { - myField = pb; - myField = ps; - myField = pc; - myField = pi; - myField = pl; - myField = pf; - myField = pd; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubLong2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubLong2Rvalue/before/Type.java deleted file mode 100644 index f7edce2eea98..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubLong2Rvalue/before/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private double myField; - public void meth(byte pb, short ps, char pc, int pi, long pl, float pf, double pd) { - myField = pb; - myField = ps; - myField = pc; - myField = pi; - myField = pl; - myField = pf; - myField = pd; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubShort2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubShort2Lvalue/after/Type.items deleted file mode 100644 index 8f0cd52a3560..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubShort2Lvalue/after/Type.items +++ /dev/null @@ -1,22 +0,0 @@ -Types: -PsiField:myByte : short -PsiField:myChar : short -PsiParameter:p : short -PsiReferenceExpression:myByte : short -PsiReferenceExpression:myChar : short -PsiReferenceExpression:p : short -PsiReferenceExpression:p : short -PsiReferenceExpression:p : short -PsiReferenceExpression:p : short -PsiReferenceExpression:p : short -PsiReferenceExpression:p : short -PsiReferenceExpression:p : short - -Conversions: -myDouble -> $ -myFloat -> $ -myInt -> $ -myLong -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubShort2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubShort2Lvalue/after/Type.java deleted file mode 100644 index ccbe23c4b4e2..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubShort2Lvalue/after/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -class Type { - private short myByte; - private short myShort; - private short myChar; - private int myInt; - private long myLong; - private float myFloat; - private double myDouble; - public void meth(short p) { - myByte = p; - myShort = p; - myChar = p; - myInt = p; - myLong = p; - myFloat = p; - myDouble = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubShort2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubShort2Lvalue/before/Type.java deleted file mode 100644 index 2d55ceaa511a..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubShort2Lvalue/before/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -class Type { - private byte myByte; - private short myShort; - private char myChar; - private int myInt; - private long myLong; - private float myFloat; - private double myDouble; - public void meth(byte p) { - myByte = p; - myShort = p; - myChar = p; - myInt = p; - myLong = p; - myFloat = p; - myDouble = p; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubShort2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubShort2Rvalue/after/Type.items deleted file mode 100644 index 754060e723ec..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubShort2Rvalue/after/Type.items +++ /dev/null @@ -1,25 +0,0 @@ -Types: -PsiField:myField : short -PsiParameter:pc : short -PsiParameter:pd : short -PsiParameter:pf : short -PsiParameter:pi : short -PsiParameter:pl : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:myField : short -PsiReferenceExpression:pc : short -PsiReferenceExpression:pd : short -PsiReferenceExpression:pf : short -PsiReferenceExpression:pi : short -PsiReferenceExpression:pl : short - -Conversions: -pb -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubShort2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubShort2Rvalue/after/Type.java deleted file mode 100644 index eb53bcd49ebc..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubShort2Rvalue/after/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private short myField; - public void meth(byte pb, short ps, short pc, short pi, short pl, short pf, short pd) { - myField = pb; - myField = ps; - myField = pc; - myField = pi; - myField = pl; - myField = pf; - myField = pd; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubShort2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubShort2Rvalue/before/Type.java deleted file mode 100644 index f7edce2eea98..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typePrimsubShort2Rvalue/before/Type.java +++ /dev/null @@ -1,12 +0,0 @@ -class Type { - private double myField; - public void meth(byte pb, short ps, char pc, int pi, long pl, float pf, double pd) { - myField = pb; - myField = ps; - myField = pc; - myField = pi; - myField = pl; - myField = pf; - myField = pd; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassChild2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassChild2Rvalue/after/Type.items deleted file mode 100644 index 78431b6e4a4a..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassChild2Rvalue/after/Type.items +++ /dev/null @@ -1,17 +0,0 @@ -Types: -PsiField:myField : ClassChild -PsiParameter:pcp : ClassChild -PsiParameter:pfc : ClassChild -PsiParameter:pfp : ClassChild -PsiReferenceExpression:myField : ClassChild -PsiReferenceExpression:myField : ClassChild -PsiReferenceExpression:myField : ClassChild -PsiReferenceExpression:myField : ClassChild -PsiReferenceExpression:pcp : ClassChild -PsiReferenceExpression:pfc : ClassChild -PsiReferenceExpression:pfp : ClassChild - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassChild2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassChild2Rvalue/after/Type.java deleted file mode 100644 index f5d9434c07c4..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassChild2Rvalue/after/Type.java +++ /dev/null @@ -1,14 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} -class ClassParent implements FaceChild {} -class ClassChild extends ClassParent {} - -class Type { - private ClassChild myField; - public void meth(ClassChild pcc, ClassChild pcp, ClassChild pfc, ClassChild pfp) { - myField = pcc; - myField = pcp; - myField = pfc; - myField = pfp; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassChild2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassChild2Rvalue/before/Type.java deleted file mode 100644 index e5cfab9f9af5..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassChild2Rvalue/before/Type.java +++ /dev/null @@ -1,14 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} -class ClassParent implements FaceChild {} -class ClassChild extends ClassParent {} - -class Type { - private FaceParent myField; - public void meth(ClassChild pcc, ClassParent pcp, FaceChild pfc, FaceParent pfp) { - myField = pcc; - myField = pcp; - myField = pfc; - myField = pfp; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassParent2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassParent2Lvalue/after/Type.items deleted file mode 100644 index 18fce6b3d6ec..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassParent2Lvalue/after/Type.items +++ /dev/null @@ -1,15 +0,0 @@ -Types: -PsiField:myClassChild : ClassParent -PsiParameter:p : ClassParent -PsiReferenceExpression:myClassChild : ClassParent -PsiReferenceExpression:p : ClassParent -PsiReferenceExpression:p : ClassParent -PsiReferenceExpression:p : ClassParent -PsiReferenceExpression:p : ClassParent - -Conversions: -myFaceChild -> $ -myFaceParent -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassParent2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassParent2Lvalue/after/Type.java deleted file mode 100644 index 8d7fee567890..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassParent2Lvalue/after/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} -class ClassParent implements FaceChild {} -class ClassChild extends ClassParent {} - -class Type { - private ClassParent myClassChild; - private ClassParent myClassParent; - private FaceChild myFaceChild; - private FaceParent myFaceParent; - - public void meth(ClassParent p) { - myClassChild = p; - myClassParent = p; - myFaceChild = p; - myFaceParent = p; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassParent2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassParent2Lvalue/before/Type.java deleted file mode 100644 index 074af076748d..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassParent2Lvalue/before/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} -class ClassParent implements FaceChild {} -class ClassChild extends ClassParent {} - -class Type { - private ClassChild myClassChild; - private ClassParent myClassParent; - private FaceChild myFaceChild; - private FaceParent myFaceParent; - - public void meth(ClassChild p) { - myClassChild = p; - myClassParent = p; - myFaceChild = p; - myFaceParent = p; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassParent2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassParent2Rvalue/after/Type.items deleted file mode 100644 index 4e7bfb9a5f9a..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassParent2Rvalue/after/Type.items +++ /dev/null @@ -1,16 +0,0 @@ -Types: -PsiField:myField : ClassParent -PsiParameter:pfc : ClassParent -PsiParameter:pfp : ClassParent -PsiReferenceExpression:myField : ClassParent -PsiReferenceExpression:myField : ClassParent -PsiReferenceExpression:myField : ClassParent -PsiReferenceExpression:myField : ClassParent -PsiReferenceExpression:pfc : ClassParent -PsiReferenceExpression:pfp : ClassParent - -Conversions: -pcc -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassParent2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassParent2Rvalue/after/Type.java deleted file mode 100644 index 9953f41083c5..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassParent2Rvalue/after/Type.java +++ /dev/null @@ -1,14 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} -class ClassParent implements FaceChild {} -class ClassChild extends ClassParent {} - -class Type { - private ClassParent myField; - public void meth(ClassChild pcc, ClassParent pcp, ClassParent pfc, ClassParent pfp) { - myField = pcc; - myField = pcp; - myField = pfc; - myField = pfp; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassParent2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassParent2Rvalue/before/Type.java deleted file mode 100644 index e5cfab9f9af5..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefClassParent2Rvalue/before/Type.java +++ /dev/null @@ -1,14 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} -class ClassParent implements FaceChild {} -class ClassChild extends ClassParent {} - -class Type { - private FaceParent myField; - public void meth(ClassChild pcc, ClassParent pcp, FaceChild pfc, FaceParent pfp) { - myField = pcc; - myField = pcp; - myField = pfc; - myField = pfp; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceChild2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceChild2Lvalue/after/Type.items deleted file mode 100644 index 9dd227a952df..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceChild2Lvalue/after/Type.items +++ /dev/null @@ -1,16 +0,0 @@ -Types: -PsiField:myClassChild : FaceChild -PsiField:myClassParent : FaceChild -PsiParameter:p : FaceChild -PsiReferenceExpression:myClassChild : FaceChild -PsiReferenceExpression:myClassParent : FaceChild -PsiReferenceExpression:p : FaceChild -PsiReferenceExpression:p : FaceChild -PsiReferenceExpression:p : FaceChild -PsiReferenceExpression:p : FaceChild - -Conversions: -myFaceParent -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceChild2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceChild2Lvalue/after/Type.java deleted file mode 100644 index f4b8de1d6028..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceChild2Lvalue/after/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} -class ClassParent implements FaceChild {} -class ClassChild extends ClassParent {} - -class Type { - private FaceChild myClassChild; - private FaceChild myClassParent; - private FaceChild myFaceChild; - private FaceParent myFaceParent; - - public void meth(FaceChild p) { - myClassChild = p; - myClassParent = p; - myFaceChild = p; - myFaceParent = p; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceChild2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceChild2Lvalue/before/Type.java deleted file mode 100644 index 074af076748d..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceChild2Lvalue/before/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} -class ClassParent implements FaceChild {} -class ClassChild extends ClassParent {} - -class Type { - private ClassChild myClassChild; - private ClassParent myClassParent; - private FaceChild myFaceChild; - private FaceParent myFaceParent; - - public void meth(ClassChild p) { - myClassChild = p; - myClassParent = p; - myFaceChild = p; - myFaceParent = p; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceChild2Rvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceChild2Rvalue/after/Type.items deleted file mode 100644 index 91683c097f98..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceChild2Rvalue/after/Type.items +++ /dev/null @@ -1,15 +0,0 @@ -Types: -PsiField:myField : FaceChild -PsiParameter:pfp : FaceChild -PsiReferenceExpression:myField : FaceChild -PsiReferenceExpression:myField : FaceChild -PsiReferenceExpression:myField : FaceChild -PsiReferenceExpression:myField : FaceChild -PsiReferenceExpression:pfp : FaceChild - -Conversions: -pcc -> $ -pcp -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceChild2Rvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceChild2Rvalue/after/Type.java deleted file mode 100644 index f16470efa1df..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceChild2Rvalue/after/Type.java +++ /dev/null @@ -1,14 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} -class ClassParent implements FaceChild {} -class ClassChild extends ClassParent {} - -class Type { - private FaceChild myField; - public void meth(ClassChild pcc, ClassParent pcp, FaceChild pfc, FaceChild pfp) { - myField = pcc; - myField = pcp; - myField = pfc; - myField = pfp; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceChild2Rvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceChild2Rvalue/before/Type.java deleted file mode 100644 index e5cfab9f9af5..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceChild2Rvalue/before/Type.java +++ /dev/null @@ -1,14 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} -class ClassParent implements FaceChild {} -class ClassChild extends ClassParent {} - -class Type { - private FaceParent myField; - public void meth(ClassChild pcc, ClassParent pcp, FaceChild pfc, FaceParent pfp) { - myField = pcc; - myField = pcp; - myField = pfc; - myField = pfp; - } -} diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceParent2Lvalue/after/Type.items b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceParent2Lvalue/after/Type.items deleted file mode 100644 index a10aad579ef2..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceParent2Lvalue/after/Type.items +++ /dev/null @@ -1,17 +0,0 @@ -Types: -PsiField:myClassChild : FaceParent -PsiField:myClassParent : FaceParent -PsiField:myFaceChild : FaceParent -PsiParameter:p : FaceParent -PsiReferenceExpression:myClassChild : FaceParent -PsiReferenceExpression:myClassParent : FaceParent -PsiReferenceExpression:myFaceChild : FaceParent -PsiReferenceExpression:p : FaceParent -PsiReferenceExpression:p : FaceParent -PsiReferenceExpression:p : FaceParent -PsiReferenceExpression:p : FaceParent - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceParent2Lvalue/after/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceParent2Lvalue/after/Type.java deleted file mode 100644 index d53c072b9b56..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceParent2Lvalue/after/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} -class ClassParent implements FaceChild {} -class ClassChild extends ClassParent {} - -class Type { - private FaceParent myClassChild; - private FaceParent myClassParent; - private FaceParent myFaceChild; - private FaceParent myFaceParent; - - public void meth(FaceParent p) { - myClassChild = p; - myClassParent = p; - myFaceChild = p; - myFaceParent = p; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceParent2Lvalue/before/Type.java b/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceParent2Lvalue/before/Type.java deleted file mode 100644 index 074af076748d..000000000000 --- a/plugins/typeMigration/testData/refactoring/migrateTypeSignature/typeRefFaceParent2Lvalue/before/Type.java +++ /dev/null @@ -1,18 +0,0 @@ -interface FaceParent {} -interface FaceChild extends FaceParent {} -class ClassParent implements FaceChild {} -class ClassChild extends ClassParent {} - -class Type { - private ClassChild myClassChild; - private ClassParent myClassParent; - private FaceChild myFaceChild; - private FaceParent myFaceParent; - - public void meth(ClassChild p) { - myClassChild = p; - myClassParent = p; - myFaceChild = p; - myFaceParent = p; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t01/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t01/after/Test.items deleted file mode 100644 index 702373b694d5..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t01/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiMethodCallExpression:i.foo(new Integer[0]) : Foo -PsiParameter:i : Foo -PsiReferenceExpression:i : Foo - -Conversions: -i.foo -> PsiMethod:moo - -New expression type changes: -Fails: -new Integer[0]->int diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t01/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t01/after/test.java deleted file mode 100644 index cf8dd0203f05..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t01/after/test.java +++ /dev/null @@ -1,39 +0,0 @@ - -/** - * Created by IntelliJ IDEA. - * User: db - * Date: Oct 16, 2004 - * Time: 10:10:35 PM - * To change this template use File | Settings | File Templates. - */ - -class Foo { - Moo moo(int i) { - return null; - } -} - -class Moo { - Foo foo(Integer[] j) { - return null; - } -} - -class P { - int f(int y) { - return y; - } -} - -class G extends P { - int f(int y) { - return y; - } -} - -public class Test { - Moo g(Foo i) { - Foo j = i.moo(new Integer[0]); - return null; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t01/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t01/before/test.java deleted file mode 100644 index 1f7a52e4aa63..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t01/before/test.java +++ /dev/null @@ -1,39 +0,0 @@ - -/** - * Created by IntelliJ IDEA. - * User: db - * Date: Oct 16, 2004 - * Time: 10:10:35 PM - * To change this template use File | Settings | File Templates. - */ - -class Foo { - Moo moo(int i) { - return null; - } -} - -class Moo { - Foo foo(Integer[] j) { - return null; - } -} - -class P { - int f(int y) { - return y; - } -} - -class G extends P { - int f(int y) { - return y; - } -} - -public class Test { - Moo g(Moo i) { - Foo j = i.foo(new Integer[0]); - return null; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t02/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t02/after/Test.items deleted file mode 100644 index eb13633449ca..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t02/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiMethod:sum : java.lang.Integer -PsiMethodCallExpression:sum(n, k) : java.lang.Integer - -Conversions: -a -> $ -i + j -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t02/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t02/after/test.java deleted file mode 100644 index 5842b8fa99e0..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t02/after/test.java +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Created by IntelliJ IDEA. - * User: db - * Date: Nov 15, 2004 - * Time: 5:40:02 PM - * To change this template use File | Settings | File Templates. - */ -public class Test { - Integer sum(int i, int j) { - return i + j; - } - - int foo(int n, int k) { - int a; - - a = sum(n, k); - - return a; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t02/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t02/before/test.java deleted file mode 100644 index d0ebca58783c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t02/before/test.java +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Created by IntelliJ IDEA. - * User: db - * Date: Nov 15, 2004 - * Time: 5:40:02 PM - * To change this template use File | Settings | File Templates. - */ -public class Test { - int sum(int i, int j) { - return i + j; - } - - int foo(int n, int k) { - int a; - - a = sum(n, k); - - return a; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t03/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t03/after/Test.items deleted file mode 100644 index f1747c90b2ed..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t03/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiMethod:sum : java.lang.Integer -PsiMethodCallExpression:sum(i, k) : java.lang.Integer - -Conversions: -a -> $ -i + j -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t03/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t03/after/test.java deleted file mode 100644 index 5fd61417ba05..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t03/after/test.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Created by IntelliJ IDEA. - * User: db - * Date: Nov 15, 2004 - * Time: 5:40:02 PM - * To change this template use File | Settings | File Templates. - */ -public class Test { - Integer sum(int i, int j) { - return i + j; - } - - int[] foo(int n, int k) { - int[] a = new int[n]; - - for (int i = 0; i < a.length; i++) { - a[i] = sum(i, k); - } - - return a; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t03/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t03/before/test.java deleted file mode 100644 index 9e1559784bde..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t03/before/test.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Created by IntelliJ IDEA. - * User: db - * Date: Nov 15, 2004 - * Time: 5:40:02 PM - * To change this template use File | Settings | File Templates. - */ -public class Test { - int sum(int i, int j) { - return i + j; - } - - int[] foo(int n, int k) { - int[] a = new int[n]; - - for (int i = 0; i < a.length; i++) { - a[i] = sum(i, k); - } - - return a; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t04/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t04/after/Test.items deleted file mode 100644 index edea723357ea..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t04/after/Test.items +++ /dev/null @@ -1,21 +0,0 @@ -Types: -PsiLocalVariable:a : java.lang.Long[][] -PsiMethod:bar : java.lang.Long[] -PsiMethod:foo : java.lang.Long[][] -PsiMethodCallExpression:bar() : java.lang.Long[] -PsiNewExpression:new Integer[0] : java.lang.Long[] -PsiNewExpression:new Integer[0] : java.lang.Long[] -PsiNewExpression:new Integer[0] : java.lang.Long[] -PsiNewExpression:new Integer[][] {new Integer[0], new Integer[0]} : java.lang.Long[][] -PsiReferenceExpression:a : java.lang.Long[][] -PsiReferenceExpression:a : java.lang.Long[][] -PsiReferenceExpression:a : java.lang.Long[][] - -Conversions: - -New expression type changes: -new Integer[0] -> java.lang.Long[] -new Integer[0] -> java.lang.Long[] -new Integer[0] -> java.lang.Long[] -new Integer[][] {new Integer[0], new Integer[0]} -> java.lang.Long[][] -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t04/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t04/after/test.java deleted file mode 100644 index 080208fcbd6c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t04/after/test.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Created by IntelliJ IDEA. - * User: db - * Date: Nov 15, 2004 - * Time: 5:40:02 PM - * To change this template use File | Settings | File Templates. - */ -public class Test { - Long[] bar() { - return new Long[0]; - } - - Long[][] foo(int n, int k) { - Long[][] a = new Long[][]{new Long[0], new Long[0]}; - - for (int i = 0; i < a.length; i++) { - a[i] = bar(); - } - - return a; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t04/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t04/before/test.java deleted file mode 100644 index 591b5a530d2b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t04/before/test.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Created by IntelliJ IDEA. - * User: db - * Date: Nov 15, 2004 - * Time: 5:40:02 PM - * To change this template use File | Settings | File Templates. - */ -public class Test { - Integer[] bar() { - return new Integer[0]; - } - - Integer[] foo(int n, int k) { - Integer[][] a = new Integer[][] {new Integer[0], new Integer[0]}; - - for (int i = 0; i < a.length; i++) { - a[i] = bar(); - } - - return a; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t05/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t05/after/Test.items deleted file mode 100644 index 8152c1b711e7..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t05/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:i : java.lang.Integer -PsiReferenceExpression:i : java.lang.Integer - -Conversions: -i -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t05/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t05/after/test.java deleted file mode 100644 index b74d13b84fda..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t05/after/test.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Created by IntelliJ IDEA. - * User: db - * Date: Nov 15, 2004 - * Time: 5:40:02 PM - * To change this template use File | Settings | File Templates. - */ -public class Test { - int sum(Integer i, int j) { - return i + j; - } - - int[] foo(int n, int k) { - int[] a = new int[] {1, 2, 3, 4}; - - for (int i = 0; i < a.length; i++) { - a[i] = sum(i, k); - } - - return a; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t05/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t05/before/test.java deleted file mode 100644 index e8a96127f4fd..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t05/before/test.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Created by IntelliJ IDEA. - * User: db - * Date: Nov 15, 2004 - * Time: 5:40:02 PM - * To change this template use File | Settings | File Templates. - */ -public class Test { - int sum(int i, int j) { - return i + j; - } - - int[] foo(int n, int k) { - int[] a = new int[] {1, 2, 3, 4}; - - for (int i = 0; i < a.length; i++) { - a[i] = sum(i, k); - } - - return a; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t06/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t06/after/Test.items deleted file mode 100644 index 3ad4c0f7992f..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t06/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiLocalVariable:a : B -PsiMethod:getA : B -PsiMethodCallExpression:getA () : B -PsiReferenceExpression:a : B - -Conversions: - -New expression type changes: -Fails: -new A ()->B diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t06/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t06/after/test.java deleted file mode 100644 index f4fa6ab1f876..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t06/after/test.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Created by IntelliJ IDEA. - * User: db - * Date: Nov 15, 2004 - * Time: 5:40:02 PM - * To change this template use File | Settings | File Templates. - */ -class A {} -class B {} - -public class Test { - B getA() { - return new A (); - } - - int foo() { - B a = getA (); - - if (a != null){ - return 0; - } - - return 1; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t06/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t06/before/test.java deleted file mode 100644 index 862356ebd9cc..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t06/before/test.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Created by IntelliJ IDEA. - * User: db - * Date: Nov 15, 2004 - * Time: 5:40:02 PM - * To change this template use File | Settings | File Templates. - */ -class A {} -class B {} - -public class Test { - A getA() { - return new A (); - } - - int foo() { - A a = getA (); - - if (a != null){ - return 0; - } - - return 1; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t07/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t07/after/Test.items deleted file mode 100644 index 12252787a292..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t07/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:f : java.lang.Integer[] -PsiNewExpression:new int[0] : java.lang.Integer[] - -Conversions: - -New expression type changes: -new int[0] -> java.lang.Integer[] -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t07/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t07/after/test.java deleted file mode 100644 index 09d7a0982009..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t07/after/test.java +++ /dev/null @@ -1,3 +0,0 @@ -public class Test { - Integer[] f = new Integer[0]; -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t07/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t07/before/test.java deleted file mode 100644 index 87955af32435..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t07/before/test.java +++ /dev/null @@ -1,3 +0,0 @@ -public class Test { - int[] f = new int[0]; -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t08/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t08/after/Test.items deleted file mode 100644 index 7c09ce5a46f7..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t08/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiField:f : java.lang.String[] -PsiNewExpression:new Integer[0] : java.lang.String[] -PsiParameter:i : java.lang.String -PsiReferenceExpression:f : java.lang.String[] - -Conversions: - -New expression type changes: -new Integer[0] -> java.lang.String[] -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t08/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t08/after/test.java deleted file mode 100644 index 9f13a80a2f2a..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t08/after/test.java +++ /dev/null @@ -1,6 +0,0 @@ -public class Test { - String[] f = new String[0]; - void foo() { - for (String i : f) {} - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t08/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t08/before/test.java deleted file mode 100644 index e38a9aa3155d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t08/before/test.java +++ /dev/null @@ -1,6 +0,0 @@ -public class Test { - Integer[] f = new Integer[0]; - void foo() { - for (Integer i : f) {} - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t09/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t09/after/Test.items deleted file mode 100644 index 39394462b76e..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t09/after/Test.items +++ /dev/null @@ -1,12 +0,0 @@ -Types: -PsiField:f : java.lang.String[] -PsiNewExpression:new Integer[0] : java.lang.String[] -PsiParameter:g : java.lang.String[] -PsiReferenceExpression:f : java.lang.String[] - -Conversions: -f -> $ - -New expression type changes: -new Integer[0] -> java.lang.String[] -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t09/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t09/after/test.java deleted file mode 100644 index 5e779c9e12f5..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t09/after/test.java +++ /dev/null @@ -1,8 +0,0 @@ -public class Test { - String[] f = new String[0]; - void foo() { - bar(1, f); - } - - void bar(int i, String[] g){} -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t09/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t09/before/test.java deleted file mode 100644 index db3f02ed1976..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t09/before/test.java +++ /dev/null @@ -1,8 +0,0 @@ -public class Test { - Integer[] f = new Integer[0]; - void foo() { - bar(1, f); - } - - void bar(int i, Integer[] g){} -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t10/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t10/after/Test.items deleted file mode 100644 index 77d161720fb5..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t10/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:f : java.util.List<java.lang.String> -PsiParameter:i : java.lang.String -PsiReferenceExpression:f : java.util.List<java.lang.String> - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t10/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t10/after/test.java deleted file mode 100644 index 7820f54d0340..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t10/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.List; -public class Test { - List<String> f; - void foo() { - for (String i : f) {} - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t10/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t10/before/test.java deleted file mode 100644 index 726f23a4bf8d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t10/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.List; -public class Test { - List<Integer> f; - void foo() { - for (Integer i : f) {} - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t100/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t100/after/Test.items deleted file mode 100644 index 135dca6a135e..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t100/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:f : java.util.Map<java.lang.String,java.lang.Integer> -PsiNewExpression:new HashMap<String,String>() : java.util.HashMap<java.lang.String,java.lang.Integer> - -Conversions: - -New expression type changes: -new HashMap<String,String>() -> java.util.HashMap<java.lang.String,java.lang.Integer> -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t100/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t100/after/test.java deleted file mode 100644 index b2917c86149e..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t100/after/test.java +++ /dev/null @@ -1,6 +0,0 @@ -import java.util.*; -public class Test { - Map<String, Integer> f = new HashMap<>(); - - -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t100/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t100/before/test.java deleted file mode 100644 index 7bf03e3a27da..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t100/before/test.java +++ /dev/null @@ -1,6 +0,0 @@ -import java.util.*; -public class Test { - Map<String,String> f = new HashMap<String,String>(); - - -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t101/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t101/after/Test.items deleted file mode 100644 index 285bc5b6ca51..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t101/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiMethodCallExpression:p.get(0) : java.util.ArrayList<java.lang.Integer> -PsiParameter:p : java.util.ArrayList<java.lang.Integer>[] -PsiReferenceExpression:p : java.util.ArrayList<java.lang.Integer>[] - -Conversions: -p.get(0) -> $qualifier$[$i$] $qualifier$.get($i$) p.get(0) - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t101/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t101/after/test.java deleted file mode 100644 index 6344b428b46c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t101/after/test.java +++ /dev/null @@ -1,6 +0,0 @@ -import java.util.*; -public class Test { - void meth(ArrayList<Integer>[] p) { - ArrayList<Integer> v = p[0]; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t101/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t101/before/test.java deleted file mode 100644 index e16f3d100bc9..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t101/before/test.java +++ /dev/null @@ -1,6 +0,0 @@ -import java.util.*; -public class Test { - void meth(List<ArrayList<Integer>> p) { - ArrayList<Integer> v = p.get(0); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t102/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t102/after/Test.items deleted file mode 100644 index b9f794b195bf..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t102/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:s : java.lang.Object[] -PsiReferenceExpression:s : java.lang.Object[] - -Conversions: - -New expression type changes: -Fails: -s->java.lang.Object[] diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t102/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t102/after/test.java deleted file mode 100644 index dcd056fcaf90..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t102/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -public class Test { - void method(Object[] s) { - s.add(null); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t102/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t102/before/test.java deleted file mode 100644 index f59b5db84644..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t102/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -public class Test { - void method(Set<? extends Object> s) { - s.add(null); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t103/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t103/after/Test.items deleted file mode 100644 index b13c3192a1d8..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t103/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:l : java.lang.Integer[] -PsiReferenceExpression:l : java.lang.Integer[] - -Conversions: - -New expression type changes: -Fails: -l->java.lang.Integer[] diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t103/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t103/after/test.java deleted file mode 100644 index af807d53c7b0..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t103/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -public class Test { - void method(Integer[] l) { - l.set(1, ""); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t103/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t103/before/test.java deleted file mode 100644 index 7e5802d50574..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t103/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -public class Test { - void method(ArrayList<String> l) { - l.set(1, ""); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t104/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t104/after/Test.items deleted file mode 100644 index f085abb3c681..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t104/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:l : java.lang.String[] -PsiReferenceExpression:l : java.lang.String[] - -Conversions: - -New expression type changes: -Fails: -l->java.lang.String[] diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t104/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t104/after/test.java deleted file mode 100644 index d70a09a513bd..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t104/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -public class Test { - void method(String[] l) { - l.set(1, ""); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t104/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t104/before/test.java deleted file mode 100644 index bc4b40c061a2..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t104/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -public class Test { - void method(ArrayList l) { - l.set(1, ""); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t105/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t105/after/Test.items deleted file mode 100644 index 7821f01df96c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t105/after/Test.items +++ /dev/null @@ -1,7 +0,0 @@ -Types: -PsiField:t : java.lang.String - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t105/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t105/after/test.java deleted file mode 100644 index 71797316503f..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t105/after/test.java +++ /dev/null @@ -1,3 +0,0 @@ -public class Test<T> { - String t; -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t105/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t105/before/test.java deleted file mode 100644 index 763dc905176d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t105/before/test.java +++ /dev/null @@ -1,3 +0,0 @@ -public class Test<T> { - T t; -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t106/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t106/after/Test.items deleted file mode 100644 index 2fab8a1f5fae..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t106/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:t : java.lang.String -PsiReferenceExpression:t : java.lang.String - -Conversions: - -New expression type changes: -Fails: -t->java.lang.String diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t106/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t106/after/test.java deleted file mode 100644 index dafbfca4a742..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t106/after/test.java +++ /dev/null @@ -1,6 +0,0 @@ -public class Test<T extends Number> { - String t; - void foo() { - int i = t.intValue(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t106/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t106/before/test.java deleted file mode 100644 index 65ad21055710..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t106/before/test.java +++ /dev/null @@ -1,6 +0,0 @@ -public class Test<T extends Number> { - T t; - void foo() { - int i = t.intValue(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t107/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t107/after/Test.items deleted file mode 100644 index 93a16148be72..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t107/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiField:t : java.lang.Integer -PsiMethodCallExpression:t.intValue() : int -PsiReferenceExpression:t : java.lang.Integer - -Conversions: -t.intValue() -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t107/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t107/after/test.java deleted file mode 100644 index ce44f19e2458..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t107/after/test.java +++ /dev/null @@ -1,6 +0,0 @@ -public class Test<T extends Number> { - Integer t; - void foo() { - int i = t.intValue(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t107/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t107/before/test.java deleted file mode 100644 index 65ad21055710..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t107/before/test.java +++ /dev/null @@ -1,6 +0,0 @@ -public class Test<T extends Number> { - T t; - void foo() { - int i = t.intValue(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t108/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t108/after/Test.items deleted file mode 100644 index a9f530ce25f7..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t108/after/Test.items +++ /dev/null @@ -1,12 +0,0 @@ -Types: -PsiMethodCallExpression:integer.intValue() : int -PsiParameter:integer : java.lang.Number -PsiParameter:l : java.util.List<? extends java.lang.Number> -PsiReferenceExpression:integer : java.lang.Number -PsiReferenceExpression:l : java.util.List<? extends java.lang.Number> - -Conversions: -integer.intValue() -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t108/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t108/after/test.java deleted file mode 100644 index 26b9322b4739..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t108/after/test.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.*; -public class Test { - void method(List<? extends Number> l) { - for (Number integer : l) { - System.out.println(integer.intValue()); - } - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t108/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t108/before/test.java deleted file mode 100644 index 08a3229cd932..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t108/before/test.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.*; -public class Test { - void method(List<Integer> l) { - for (Integer integer : l) { - System.out.println(integer.intValue()); - } - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t109/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t109/after/Test.items deleted file mode 100644 index 6a47f6675781..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t109/after/Test.items +++ /dev/null @@ -1,12 +0,0 @@ -Types: -PsiMethodCallExpression:integer.hashCode() : int -PsiParameter:integer : java.lang.Object -PsiParameter:l : java.util.List<? super java.lang.Number> -PsiReferenceExpression:integer : java.lang.Object -PsiReferenceExpression:l : java.util.List<? super java.lang.Number> - -Conversions: -integer.hashCode() -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t109/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t109/after/test.java deleted file mode 100644 index bae70cd5b0d4..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t109/after/test.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.*; -public class Test { - void method(List<? super Number> l) { - for (Object integer : l) { - System.out.println(integer.hashCode()); - } - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t109/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t109/before/test.java deleted file mode 100644 index 26280e892cd0..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t109/before/test.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.*; -public class Test { - void method(List<Integer> l) { - for (Integer integer : l) { - System.out.println(integer.hashCode()); - } - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t11/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t11/after/Test.items deleted file mode 100644 index 4058a7862ff2..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t11/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiField:f : java.util.Map<java.lang.String,java.lang.Integer> -PsiMethodCallExpression:f.keySet() : java.util.Set<java.lang.String> -PsiParameter:i : java.lang.String -PsiReferenceExpression:f : java.util.Map<java.lang.String,java.lang.Integer> - -Conversions: -f.keySet() -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t11/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t11/after/test.java deleted file mode 100644 index 1491875ea2b7..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t11/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.Map; -public class Test { - Map<String, Integer> f; - void foo() { - for (String i : f.keySet()) {} - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t11/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t11/before/test.java deleted file mode 100644 index b0aa7086f175..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t11/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.Map; -public class Test { - Map<Integer, Integer> f; - void foo() { - for (Integer i : f.keySet()) {} - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t110/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t110/after/Test.items deleted file mode 100644 index 3853e035e26b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t110/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiParameter:integer : java.lang.String -PsiParameter:l : java.util.List<? extends java.lang.String> -PsiReferenceExpression:integer : java.lang.String -PsiReferenceExpression:l : java.util.List<? extends java.lang.String> - -Conversions: - -New expression type changes: -Fails: -integer->java.lang.String diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t110/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t110/after/test.java deleted file mode 100644 index cb813fd6567f..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t110/after/test.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.*; -public class Test { - void method(List<? extends String> l) { - for (String integer : l) { - System.out.println(integer.intValue()); - } - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t110/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t110/before/test.java deleted file mode 100644 index 08a3229cd932..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t110/before/test.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.*; -public class Test { - void method(List<Integer> l) { - for (Integer integer : l) { - System.out.println(integer.intValue()); - } - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t111/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t111/after/Test.items deleted file mode 100644 index 29717a0b2377..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t111/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiParameter:i : java.lang.Integer[] -PsiReferenceExpression:i : java.lang.Integer[] -PsiReferenceExpression:i : java.lang.Integer[] - -Conversions: - -New expression type changes: -Fails: -i->java.lang.Integer[] -i++->java.lang.Integer[] diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t111/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t111/after/test.java deleted file mode 100644 index e257e485d6bb..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t111/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -public class Test { - void method(Integer[] i) { - if (i == 0) { - i++; - } - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t111/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t111/before/test.java deleted file mode 100644 index 2620dd9f5d6a..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t111/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -public class Test { - void method(Integer i) { - if (i == 0) { - i++; - } - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t112/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t112/after/Test.items deleted file mode 100644 index 78f2ed729f10..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t112/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiMethod:method : java.lang.Integer[] - -Conversions: -112 -> new java.lang.Integer[]{$qualifier$} $qualifier$ 112 - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t112/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t112/after/test.java deleted file mode 100644 index c31ec11010c3..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t112/after/test.java +++ /dev/null @@ -1,5 +0,0 @@ -public class Test { - Integer[] method() { - return new Integer[]{112}; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t112/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t112/before/test.java deleted file mode 100644 index e7bf28f0de1e..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t112/before/test.java +++ /dev/null @@ -1,5 +0,0 @@ -public class Test { - Integer method() { - return 112; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t113/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t113/after/Test.items deleted file mode 100644 index 1b69785be552..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t113/after/Test.items +++ /dev/null @@ -1,7 +0,0 @@ -Types: -PsiParameter:p : java.lang.Number... - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t113/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t113/after/test.java deleted file mode 100644 index 9f9bdcaffad7..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t113/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -public class Test { - void method(Number... p) {} - - public void doSmth() { - m(123); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t113/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t113/before/test.java deleted file mode 100644 index 6627e8d101de..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t113/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -public class Test { - void method(Integer... p) {} - - public void doSmth() { - m(123); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t114/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t114/after/Test.items deleted file mode 100644 index b6c70f112866..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t114/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:p : java.lang.String... -PsiReferenceExpression:p : java.lang.String[] - -Conversions: - -New expression type changes: -Fails: -p[0]->java.lang.String diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t114/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t114/after/test.java deleted file mode 100644 index 6e2b9f24c22a..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t114/after/test.java +++ /dev/null @@ -1,9 +0,0 @@ -public class Test { - void method(String... p) { - int i = p[0].intValue(); - } - - public void doSmth() { - m(123); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t114/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t114/before/test.java deleted file mode 100644 index f73951e56432..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t114/before/test.java +++ /dev/null @@ -1,9 +0,0 @@ -public class Test { - void method(Integer... p) { - int i = p[0].intValue(); - } - - public void doSmth() { - m(123); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t115/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t115/after/Test.items deleted file mode 100644 index b07cf0af793c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t115/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiParameter:i : java.lang.String... - -Conversions: - -New expression type changes: -Fails: -2->java.lang.String diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t115/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t115/after/test.java deleted file mode 100644 index 8d69a2330c70..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t115/after/test.java +++ /dev/null @@ -1,8 +0,0 @@ -class Test { - void foo(String... i) { - } - - void bar() { - foo("str", 2); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t115/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t115/before/test.java deleted file mode 100644 index f585aba2e91c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t115/before/test.java +++ /dev/null @@ -1,8 +0,0 @@ -class Test { - void foo(Object... i) { - } - - void bar() { - foo("str", 2); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t116/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t116/after/Test.items deleted file mode 100644 index 0aee5ef814c6..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t116/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiField:str : java.lang.String -PsiParameter:number : java.lang.String -PsiReferenceExpression:number : java.lang.String -PsiReferenceExpression:str : java.lang.String - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t116/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t116/after/test.java deleted file mode 100644 index 95ddfb44251f..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t116/after/test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - String str; - - void foo(String[] p) { - for (String number : p) { - number = str; - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t116/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t116/before/test.java deleted file mode 100644 index d68047e81823..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t116/before/test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - Number str; - - void foo(String[] p) { - for (Number number : p) { - number = str; - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t117/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t117/after/Test.items deleted file mode 100644 index 0aee5ef814c6..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t117/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiField:str : java.lang.String -PsiParameter:number : java.lang.String -PsiReferenceExpression:number : java.lang.String -PsiReferenceExpression:str : java.lang.String - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t117/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t117/after/test.java deleted file mode 100644 index 3172eaa133dc..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t117/after/test.java +++ /dev/null @@ -1,10 +0,0 @@ -import java.util.*; -class Test { - String str; - - void foo(List<String> p) { - for (String number : p) { - number = str; - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t117/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t117/before/test.java deleted file mode 100644 index 46cde69dca96..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t117/before/test.java +++ /dev/null @@ -1,10 +0,0 @@ -import java.util.*; -class Test { - Number str; - - void foo(List<String> p) { - for (Number number : p) { - number = str; - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t118/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t118/after/Test.items deleted file mode 100644 index dcd1be2928cb..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t118/after/Test.items +++ /dev/null @@ -1,7 +0,0 @@ -Types: -PsiParameter:p : java.lang.Integer... - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t118/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t118/after/test.java deleted file mode 100644 index 37d684a97957..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t118/after/test.java +++ /dev/null @@ -1,10 +0,0 @@ -import java.util.*; -class Test { - - void method(Integer... p) { - } - - public void doSmth(ArrayList<Integer> p) { - method(p.get(2)); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t118/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t118/before/test.java deleted file mode 100644 index 012a188e5ad5..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t118/before/test.java +++ /dev/null @@ -1,10 +0,0 @@ -import java.util.*; -class Test { - - void method(Integer p) { - } - - public void doSmth(ArrayList<Integer> p) { - method(p.get(2)); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t119/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t119/after/Test.items deleted file mode 100644 index dcd1be2928cb..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t119/after/Test.items +++ /dev/null @@ -1,7 +0,0 @@ -Types: -PsiParameter:p : java.lang.Integer... - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t119/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t119/after/test.java deleted file mode 100644 index 28446b6bc761..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t119/after/test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - - void method(Integer... p) { - } - - public void doSmth(Integer[] p) { - method(p[2]); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t119/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t119/before/test.java deleted file mode 100644 index 28aeed25cefa..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t119/before/test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - - void method(Integer p) { - } - - public void doSmth(Integer[] p) { - method(p[2]); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t12/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t12/after/Test.items deleted file mode 100644 index a1b75e0f23ac..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t12/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:f : java.util.List<java.lang.String> -PsiLocalVariable:i : java.lang.String -PsiReferenceExpression:f : java.util.List<java.lang.String> - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t12/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t12/after/test.java deleted file mode 100644 index 657869206253..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t12/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -public class Test { - List<String> f; - void foo() { - String i = Collections.min(f); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t12/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t12/before/test.java deleted file mode 100644 index 24199ff02584..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t12/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -public class Test { - List<Integer> f; - void foo() { - Integer i = Collections.min(f); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t120/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t120/after/Test.items deleted file mode 100644 index 6f23d60f1d3c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t120/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiParameter:p : java.lang.String... -PsiParameter:p : java.lang.String[] -PsiReferenceExpression:p : java.lang.String[] -PsiReferenceExpression:p : java.lang.String[] - -Conversions: - -New expression type changes: -Fails: -p[3]->java.lang.String diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t120/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t120/after/test.java deleted file mode 100644 index e40c1215581b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t120/after/test.java +++ /dev/null @@ -1,10 +0,0 @@ -class Test { - - void method(String... p) { - } - - public void doSmth(String[] p) { - method(p[2]); - System.out.println(p[3].intValue()); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t120/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t120/before/test.java deleted file mode 100644 index 0f65e57d94ee..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t120/before/test.java +++ /dev/null @@ -1,10 +0,0 @@ -class Test { - - void method(Integer p) { - } - - public void doSmth(Integer[] p) { - method(p[2]); - System.out.println(p[3].intValue()); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t121/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t121/after/Test.items deleted file mode 100644 index dadc2c72891a..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t121/after/Test.items +++ /dev/null @@ -1,12 +0,0 @@ -Types: -PsiMethodCallExpression:p.add(8) : boolean -PsiParameter:p : java.util.ArrayList<java.lang.Float> -PsiReferenceExpression:p : java.util.ArrayList<java.lang.Float> - -Conversions: -8 -> $ -p.add(8) -> $ - -New expression type changes: -Fails: -8->java.lang.Float diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t121/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t121/after/test.java deleted file mode 100644 index e3a952e4d560..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t121/after/test.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.*; -class Test { - - void method(ArrayList<Float> p){ - p.add(8); - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t121/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t121/before/test.java deleted file mode 100644 index aad87ca532b7..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t121/before/test.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.*; -class Test { - - void method(ArrayList<Number> p){ - p.add(8); - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t122/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t122/after/Test.items deleted file mode 100644 index 00092fc53a55..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t122/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:p : java.util.List<java.lang.Integer>[] -PsiReferenceExpression:p : java.util.List<java.lang.Integer>[] - -Conversions: - -New expression type changes: -Fails: -p->java.util.List<java.lang.Integer>[] diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t122/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t122/after/test.java deleted file mode 100644 index 5784ee52e360..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t122/after/test.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.*; -class Test { - - void method(List<Integer>[] p){ - ArrayList<Integer> v = p.get(0); - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t122/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t122/before/test.java deleted file mode 100644 index bb086dad2af8..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t122/before/test.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.*; -class Test { - - void method(List<ArrayList<Integer>> p){ - ArrayList<Integer> v = p.get(0); - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t123/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t123/after/Test.items deleted file mode 100644 index 691d3e6a1e26..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t123/after/Test.items +++ /dev/null @@ -1,12 +0,0 @@ -Types: -PsiField:n : java.lang.Integer -PsiParameter:number : java.lang.Integer -PsiParameter:p : java.lang.Integer[] -PsiReferenceExpression:n : java.lang.Integer -PsiReferenceExpression:number : java.lang.Integer -PsiReferenceExpression:p : java.lang.Integer[] - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t123/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t123/after/test.java deleted file mode 100644 index 883991ffec9d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t123/after/test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - Integer n; - - void foo(Integer[] p) { - for (Integer number : p) { - n = number; - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t123/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t123/before/test.java deleted file mode 100644 index 516fcf828234..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t123/before/test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - Number n; - - void foo(Number[] p) { - for (Number number : p) { - n = number; - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t124/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t124/after/Test.items deleted file mode 100644 index 4a7df94f76b2..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t124/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:p : java.lang.Integer -PsiReferenceExpression:p : java.lang.Integer - -Conversions: - -New expression type changes: -Fails: -p->java.lang.Integer diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t124/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t124/after/test.java deleted file mode 100644 index f41fe88534f4..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t124/after/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - public <U> U meth(Integer p) { - return p; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t124/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t124/before/test.java deleted file mode 100644 index b40d864d16c7..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t124/before/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - public <U> U meth(U p) { - return p; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t125/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t125/after/Test.items deleted file mode 100644 index 3859bad4e428..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t125/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:p : java.lang.Integer -PsiReferenceExpression:p : java.lang.Integer - -Conversions: - -New expression type changes: -Fails: -Collections.singletonList(p)->java.util.List<java.lang.Integer> diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t125/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t125/after/test.java deleted file mode 100644 index 7854f476cc9e..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t125/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - public <U> List<U> meth(Integer p) { - return Collections.singletonList(p); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t125/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t125/before/test.java deleted file mode 100644 index 30cf3914d62a..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t125/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - public <U> List<U> meth(U p) { - return Collections.singletonList(p); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t126/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t126/after/Test.items deleted file mode 100644 index f870c21c0523..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t126/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiMethod:meth : T - -Conversions: - -New expression type changes: -Fails: -map.get(2)->T diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t126/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t126/after/test.java deleted file mode 100644 index 7b2814378d28..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t126/after/test.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.*; - -class Test<T> { - Map<Integer, String> map; - - T meth() { - return map.get(2); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t126/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t126/before/test.java deleted file mode 100644 index 0dc76ccbdc72..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t126/before/test.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.*; - -class Test<T> { - Map<Integer, String> map; - - String meth() { - return map.get(2); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t127/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t127/after/Test.items deleted file mode 100644 index 78aa0fbd396b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t127/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiLocalVariable:i : long -PsiMethod:test234 : long -PsiMethodCallExpression:test234(1, - 2) : long - -Conversions: -1 -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t127/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t127/after/test.java deleted file mode 100644 index 06a4d09a41a6..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t127/after/test.java +++ /dev/null @@ -1,13 +0,0 @@ -public class Test { - - public long test234(int i, - int j) - { - return 1; - } - - public void foo() { - long i = test234(1, - 2); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t127/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t127/before/test.java deleted file mode 100644 index dd2c813fd38e..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t127/before/test.java +++ /dev/null @@ -1,13 +0,0 @@ -public class Test { - - public int test234(int i, - int j) - { - return 1; - } - - public void foo() { - int i = test234(1, - 2); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t128/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t128/after/Test.items deleted file mode 100644 index 24ec208dbb43..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t128/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiMethodCallExpression:e.printStackTrace() : void -PsiParameter:e : Test.E -PsiReferenceExpression:e : Test.E - -Conversions: -e.printStackTrace() -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t128/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t128/after/test.java deleted file mode 100644 index 8f2ad153d911..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t128/after/test.java +++ /dev/null @@ -1,16 +0,0 @@ -class Test { - static class E extends Exception { } - static class E1 extends E { } - static class E2 extends E { } - - void m(boolean f) { - try { - if (f) - throw new E1(); - else - throw new E2(); - } catch (E e) { - e.printStackTrace(); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t128/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t128/before/test.java deleted file mode 100644 index 33bb6bf973c1..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t128/before/test.java +++ /dev/null @@ -1,16 +0,0 @@ -class Test { - static class E extends Exception { } - static class E1 extends E { } - static class E2 extends E { } - - void m(boolean f) { - try { - if (f) - throw new E1(); - else - throw new E2(); - } catch (E1 | E2 e) { - e.printStackTrace(); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t129/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t129/after/Test.items deleted file mode 100644 index 8ca26492b5bd..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t129/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiMethodCallExpression:e.printStackTrace() : void -PsiParameter:e : Test.E1 | Test.E2 -PsiReferenceExpression:e : Test.E1 | Test.E2 - -Conversions: -e.printStackTrace() -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t129/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t129/after/test.java deleted file mode 100644 index 33bb6bf973c1..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t129/after/test.java +++ /dev/null @@ -1,16 +0,0 @@ -class Test { - static class E extends Exception { } - static class E1 extends E { } - static class E2 extends E { } - - void m(boolean f) { - try { - if (f) - throw new E1(); - else - throw new E2(); - } catch (E1 | E2 e) { - e.printStackTrace(); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t129/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t129/before/test.java deleted file mode 100644 index 8f2ad153d911..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t129/before/test.java +++ /dev/null @@ -1,16 +0,0 @@ -class Test { - static class E extends Exception { } - static class E1 extends E { } - static class E2 extends E { } - - void m(boolean f) { - try { - if (f) - throw new E1(); - else - throw new E2(); - } catch (E e) { - e.printStackTrace(); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t13/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t13/after/Test.items deleted file mode 100644 index ca5cc75efa2e..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t13/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiField:f : java.util.List<java.lang.Integer> -PsiMethodCallExpression:f.add("val") : boolean -PsiReferenceExpression:f : java.util.List<java.lang.Integer> - -Conversions: -f.add("val") -> $ - -New expression type changes: -Fails: -"val"->java.lang.Integer diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t13/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t13/after/test.java deleted file mode 100644 index 53b97a29e38c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t13/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -public class Test { - List<Integer> f; - void foo() { - f.add("val"); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t13/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t13/before/test.java deleted file mode 100644 index 9024eab86966..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t13/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -public class Test { - List<String> f; - void foo() { - f.add("val"); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t130/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t130/after/Test.items deleted file mode 100644 index 056ae7968e06..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t130/after/Test.items +++ /dev/null @@ -1,12 +0,0 @@ -Types: -PsiMethodCallExpression:e.printStackTrace() : void -PsiParameter:e : Test.E -PsiReferenceExpression:e : Test.E -PsiReferenceExpression:e : Test.E - -Conversions: -e.printStackTrace() -> $ - -New expression type changes: -Fails: -e->Test.E diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t130/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t130/after/test.java deleted file mode 100644 index 67ed3db2315a..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t130/after/test.java +++ /dev/null @@ -1,18 +0,0 @@ -class Test { - static class E extends Exception { } - static interface I { void i(); } - static class E1 extends E implements I { public void i() { } } - static class E2 extends E implements I { public void i() { } } - - void m(boolean f) { - try { - if (f) - throw new E1(); - else - throw new E2(); - } catch (E e) { - e.printStackTrace(); - e.i(); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t130/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t130/before/test.java deleted file mode 100644 index 7ee7852db3d4..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t130/before/test.java +++ /dev/null @@ -1,18 +0,0 @@ -class Test { - static class E extends Exception { } - static interface I { void i(); } - static class E1 extends E implements I { public void i() { } } - static class E2 extends E implements I { public void i() { } } - - void m(boolean f) { - try { - if (f) - throw new E1(); - else - throw new E2(); - } catch (E1 | E2 e) { - e.printStackTrace(); - e.i(); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t131/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t131/after/Test.items deleted file mode 100644 index e8d3b6152d2d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t131/after/Test.items +++ /dev/null @@ -1,13 +0,0 @@ -Types: -PsiMethodCallExpression:e.i() : void -PsiMethodCallExpression:e.printStackTrace() : void -PsiParameter:e : Test.E2 | Test.E1 -PsiReferenceExpression:e : Test.E2 | Test.E1 -PsiReferenceExpression:e : Test.E2 | Test.E1 - -Conversions: -e.i() -> $ -e.printStackTrace() -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t131/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t131/after/test.java deleted file mode 100644 index 5c02bb8a41f2..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t131/after/test.java +++ /dev/null @@ -1,18 +0,0 @@ -class Test { - static class E extends Exception { } - static interface I { void i(); } - static class E1 extends E implements I { public void i() { } } - static class E2 extends E implements I { public void i() { } } - - void m(boolean f) { - try { - if (f) - throw new E1(); - else - throw new E2(); - } catch (E2 | E1 e) { - e.printStackTrace(); - e.i(); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t131/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t131/before/test.java deleted file mode 100644 index 7ee7852db3d4..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t131/before/test.java +++ /dev/null @@ -1,18 +0,0 @@ -class Test { - static class E extends Exception { } - static interface I { void i(); } - static class E1 extends E implements I { public void i() { } } - static class E2 extends E implements I { public void i() { } } - - void m(boolean f) { - try { - if (f) - throw new E1(); - else - throw new E2(); - } catch (E1 | E2 e) { - e.printStackTrace(); - e.i(); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t132/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t132/after/Test.items deleted file mode 100644 index e5b813b90288..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t132/after/Test.items +++ /dev/null @@ -1,15 +0,0 @@ -Types: -PsiMethodCallExpression:i.f() : void -PsiMethodCallExpression:i.f() : void -PsiParameter:i : I -PsiParameter:i : I -PsiParameter:i : I -PsiReferenceExpression:i : I -PsiReferenceExpression:i : I - -Conversions: -i.f() -> $ -i.f() -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t132/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t132/after/test.java deleted file mode 100644 index 6f53c98f5459..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t132/after/test.java +++ /dev/null @@ -1,25 +0,0 @@ -interface I { - void f(); -} - -interface J extends I { - void g(); -} - -public interface Test { - void h(I i); -} - -class B implements Test { - @Override - public void h(I i) { - i.f(); - } -} - -class C implements Test { - @Override - public void h(I i) { - i.f(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t132/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t132/before/test.java deleted file mode 100644 index 2e6ab23c21d6..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t132/before/test.java +++ /dev/null @@ -1,25 +0,0 @@ -interface I { - void f(); -} - -interface J extends I { - void g(); -} - -public interface Test { - void h(J i); -} - -class B implements Test { - @Override - public void h(J i) { - i.f(); - } -} - -class C implements Test { - @Override - public void h(J i) { - i.f(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t133/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t133/after/Test.items deleted file mode 100644 index 777fddf90a83..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t133/after/Test.items +++ /dev/null @@ -1,16 +0,0 @@ -Types: -PsiMethodCallExpression:i.f() : void -PsiMethodCallExpression:i.f() : void -PsiParameter:i : I -PsiParameter:i : I -PsiParameter:i : I -PsiParameter:i : I -PsiReferenceExpression:i : I -PsiReferenceExpression:i : I - -Conversions: -i.f() -> $ -i.f() -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t133/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t133/after/test.java deleted file mode 100644 index 41db920f7120..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t133/after/test.java +++ /dev/null @@ -1,33 +0,0 @@ -interface I { - void f(); -} - -interface J extends I { - void g(); -} - -public interface Test { - void h(I i); -} - -class B implements Test { - @Override - public void h(I i) { - i.f(); - } -} - -class C extends B { - @Override - public void h(I i) { - i.f(); - } -} - -abstract class F implements Test {} - -class FF extends F { - @Override - public void h(I i) { - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t133/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t133/before/test.java deleted file mode 100644 index 5599c1a59b46..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t133/before/test.java +++ /dev/null @@ -1,33 +0,0 @@ -interface I { - void f(); -} - -interface J extends I { - void g(); -} - -public interface Test { - void h(J i); -} - -class B implements Test { - @Override - public void h(J i) { - i.f(); - } -} - -class C extends B { - @Override - public void h(J i) { - i.f(); - } -} - -abstract class F implements Test {} - -class FF extends F { - @Override - public void h(J i) { - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t134/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t134/after/Test.items deleted file mode 100644 index 2880fefdc224..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t134/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiLocalVariable:i : java.lang.String -PsiParameter:a : java.lang.String -PsiReferenceExpression:a : java.lang.String - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t134/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t134/after/test.java deleted file mode 100644 index 26cb24f419d2..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t134/after/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - void buzz(final String a, final int b, final int c) { - String i = a + b + c; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t134/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t134/before/test.java deleted file mode 100644 index 7a7760404f36..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t134/before/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - void buzz(final int a, final int b, final int c) { - int i = a + b + c; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t135/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t135/after/Test.items deleted file mode 100644 index 4e20b05def59..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t135/after/Test.items +++ /dev/null @@ -1,16 +0,0 @@ -Types: -PsiField:bar : int -PsiField:foo : int -PsiParameter:bar : int -PsiParameter:foo : int -PsiReferenceExpression:bar : int -PsiReferenceExpression:bar : int -PsiReferenceExpression:foo : int -PsiReferenceExpression:foo : int -PsiReferenceExpression:this.bar : int -PsiReferenceExpression:this.foo : int - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t135/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t135/after/test.java deleted file mode 100644 index c992fd8569bf..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t135/after/test.java +++ /dev/null @@ -1,19 +0,0 @@ -class Test { - private int foo, bar; - - public long getFoo() { - return foo; - } - - public void setFoo(int foo) { - this.foo = foo; - } - - public long getBar() { - return bar; - } - - public void setBar(int bar) { - this.bar = bar; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t135/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t135/before/test.java deleted file mode 100644 index 756e9380835d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t135/before/test.java +++ /dev/null @@ -1,19 +0,0 @@ -class Test { - private long foo, bar; - - public long getFoo() { - return foo; - } - - public void setFoo(long foo) { - this.foo = foo; - } - - public long getBar() { - return bar; - } - - public void setBar(long bar) { - this.bar = bar; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t136/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t136/after/Test.items deleted file mode 100644 index 617357a07275..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t136/after/Test.items +++ /dev/null @@ -1,17 +0,0 @@ -Types: -PsiLocalVariable:ints : java.util.ArrayList<java.lang.String> -PsiMethodCallExpression:ints.add(i) : boolean -PsiNewExpression:new ArrayList<Integer>() : java.util.ArrayList<java.lang.String> -PsiParameter:i : java.lang.String -PsiReferenceExpression:i : java.lang.String -PsiReferenceExpression:i : java.lang.String -PsiReferenceExpression:ints : java.util.ArrayList<java.lang.String> -PsiReferenceExpression:ints : java.util.ArrayList<java.lang.String> - -Conversions: -i -> $ -ints.add(i) -> $ - -New expression type changes: -new ArrayList<Integer>() -> java.util.ArrayList<java.lang.String> -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t136/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t136/after/test.java deleted file mode 100644 index 08185f4c079c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t136/after/test.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.*; -class Test { - private void foo(String i) { - ArrayList<String> ints = new ArrayList<>(); - ints.add(i); - Object j = constantaB == null ? ints : i; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t136/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t136/before/test.java deleted file mode 100644 index e66f3a5f5bfa..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t136/before/test.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.*; -class Test { - private void foo(Integer i) { - ArrayList<Integer> ints = new ArrayList<Integer>(); - ints.add(i); - Object j = constantaB == null ? ints : i; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t137/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t137/after/Test.items deleted file mode 100644 index 01da876f7e94..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t137/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:i : java.lang.String -PsiReferenceExpression:i : java.lang.String - -Conversions: - -New expression type changes: -Fails: -i[0]->java.lang.String diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t137/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t137/after/test.java deleted file mode 100644 index b2d59c1303dc..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t137/after/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - private void foo(String i) { - int p = i[0]; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t137/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t137/before/test.java deleted file mode 100644 index 832535bc9440..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t137/before/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - private void foo(int i) { - int p = i[0]; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t138/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t138/after/Test.items deleted file mode 100644 index 176574ab1bc0..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t138/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiParameter:set : java.util.Collection<java.lang.String> -PsiReferenceExpression:set : java.util.Collection<java.lang.String> - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t138/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t138/after/test.java deleted file mode 100644 index 141e122e2ccc..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t138/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - Set<String> mySet = new HashSet(); - void foo(Collection<String> set) { - mySet.retainAll(set); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t138/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t138/before/test.java deleted file mode 100644 index 28feb3c90d4a..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t138/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - Set<String> mySet = new HashSet(); - void foo(Set<String> set) { - mySet.retainAll(set); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t139/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t139/after/Test.items deleted file mode 100644 index 2fbe632fa578..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t139/after/Test.items +++ /dev/null @@ -1,7 +0,0 @@ -Types: -PsiParameter:s : java.lang.Integer - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t139/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t139/after/test.java deleted file mode 100644 index d91661b68309..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t139/after/test.java +++ /dev/null @@ -1,10 +0,0 @@ -import java.util.*; - -abstract class A implements Iterable<String> {} - -class Test { - void test(A it) { - for(Integer s : it) { - } - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t139/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t139/before/test.java deleted file mode 100644 index f937525f52e2..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t139/before/test.java +++ /dev/null @@ -1,10 +0,0 @@ -import java.util.*; - -abstract class A implements Iterable<String> {} - -class Test { - void test(A it) { - for(String s : it) { - } - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t14/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t14/after/Test.items deleted file mode 100644 index 21635daebc66..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t14/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiField:f : A -PsiMethodCallExpression:f.foo() : int -PsiReferenceExpression:f : A - -Conversions: -f.foo() -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t14/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t14/after/test.java deleted file mode 100644 index de034ae20adf..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t14/after/test.java +++ /dev/null @@ -1,13 +0,0 @@ -public class Test { - A f; - int bar(){ - return f.foo(); - } -} -class A { - int foo(){ - return 0; - } -} - -class B extends A{}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t14/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t14/before/test.java deleted file mode 100644 index 8f6feeba681d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t14/before/test.java +++ /dev/null @@ -1,13 +0,0 @@ -public class Test { - B f; - int bar(){ - return f.foo(); - } -} -class A { - int foo(){ - return 0; - } -} - -class B extends A{}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t15/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t15/after/Test.items deleted file mode 100644 index 31ff4b94b421..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t15/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiField:f : A -PsiMethodCallExpression:f.foo(f) : int -PsiReferenceExpression:f : A -PsiReferenceExpression:f : A - -Conversions: -f.foo(f) -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t15/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t15/after/test.java deleted file mode 100644 index dcc5808448d5..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t15/after/test.java +++ /dev/null @@ -1,16 +0,0 @@ -public class Test { - A f; - int bar(){ - return f.foo(f); - } -} -class A { - /** - * @param a - */ - int foo(A a){ - return 0; - } -} - -class B extends A{}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t15/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t15/before/test.java deleted file mode 100644 index b22cc32ea85b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t15/before/test.java +++ /dev/null @@ -1,16 +0,0 @@ -public class Test { - B f; - int bar(){ - return f.foo(f); - } -} -class A { - /** - * @param a - */ - int foo(A a){ - return 0; - } -} - -class B extends A{}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t16/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t16/after/Test.items deleted file mode 100644 index c0038308e560..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t16/after/Test.items +++ /dev/null @@ -1,12 +0,0 @@ -Types: -PsiField:f : B -PsiMethodCallExpression:f.foo(f) : B -PsiReferenceExpression:f : B -PsiReferenceExpression:f : B - -Conversions: -f -> $ -f.foo(f) -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t16/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t16/after/test.java deleted file mode 100644 index 8c87396bcb3d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t16/after/test.java +++ /dev/null @@ -1,15 +0,0 @@ -class Test { - B f; - - A bar() { - return f.foo(f); - } -} -class A { - <T> T foo(T t) { - return t; - } -} - -class B extends A { -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t16/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t16/before/test.java deleted file mode 100644 index c401bf03de20..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t16/before/test.java +++ /dev/null @@ -1,15 +0,0 @@ -class Test { - A f; - - A bar() { - return f.foo(f); - } -} -class A { - <T> T foo(T t) { - return t; - } -} - -class B extends A { -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t17/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t17/after/Test.items deleted file mode 100644 index aa0aa0551659..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t17/after/Test.items +++ /dev/null @@ -1,18 +0,0 @@ -Types: -PsiField:f : B -PsiMethodCallExpression:f.foo(s) : B -PsiMethodCallExpression:s.add(f) : boolean -PsiParameter:s : java.util.Set<B> -PsiReferenceExpression:f : B -PsiReferenceExpression:f : B -PsiReferenceExpression:s : java.util.Set<B> -PsiReferenceExpression:s : java.util.Set<B> - -Conversions: -f -> $ -f.foo(s) -> $ -s -> $ -s.add(f) -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t17/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t17/after/test.java deleted file mode 100644 index 73530057f21b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t17/after/test.java +++ /dev/null @@ -1,17 +0,0 @@ -import java.util.*; -class Test { - B f; - - A bar(Set<B> s) { - s.add(f); - return f.foo(s); - } -} -class A { - <T> T foo(Set<T> t) { - return null; - } -} - -class B extends A { -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t17/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t17/before/test.java deleted file mode 100644 index a425495c6065..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t17/before/test.java +++ /dev/null @@ -1,17 +0,0 @@ -import java.util.*; -class Test { - A f; - - A bar(Set<A> s) { - s.add(f); - return f.foo(s); - } -} -class A { - <T> T foo(Set<T> t) { - return null; - } -} - -class B extends A { -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t18/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t18/after/Test.items deleted file mode 100644 index 2f426a4bb9b0..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t18/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiField:f : B -PsiReferenceExpression:f : B - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t18/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t18/after/test.java deleted file mode 100644 index 35d9b61c1045..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t18/after/test.java +++ /dev/null @@ -1,11 +0,0 @@ -import java.util.*; -class Test { - B f; - void bar(Set<A> s) { - for (String s : f) {} - } -} - -class A<Y> extends List<String> {} - -class B extends A<Integer> {}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t18/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t18/before/test.java deleted file mode 100644 index 3113a46d5dc6..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t18/before/test.java +++ /dev/null @@ -1,11 +0,0 @@ -import java.util.*; -class Test { - A f; - void bar(Set<A> s) { - for (String s : f) {} - } -} - -class A<Y> extends List<String> {} - -class B extends A<Integer> {}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t19/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t19/after/Test.items deleted file mode 100644 index a2ec06ad3634..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t19/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiField:f : java.util.HashMap<java.lang.Integer,java.lang.Integer> -PsiLocalVariable:s : java.util.Set<java.lang.Integer> -PsiMethodCallExpression:f.keySet() : java.util.Set<java.lang.Integer> -PsiReferenceExpression:f : java.util.HashMap<java.lang.Integer,java.lang.Integer> - -Conversions: -f.keySet() -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t19/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t19/after/test.java deleted file mode 100644 index 9609791bb138..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t19/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - HashMap<Integer, Integer> f; - void foo() { - Set<Integer> s = f.keySet(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t19/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t19/before/test.java deleted file mode 100644 index 815f0ed1ab3a..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t19/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - Map<String, String> f; - void foo() { - Set<String> s = f.keySet(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t20/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t20/after/Test.items deleted file mode 100644 index c97038d663ce..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t20/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiField:f : java.util.Map<java.lang.String,java.lang.String> -PsiLocalVariable:s : java.util.Set<java.lang.String> -PsiMethodCallExpression:f.keySet() : java.util.Set<java.lang.String> -PsiReferenceExpression:f : java.util.Map<java.lang.String,java.lang.String> - -Conversions: -f.keySet() -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t20/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t20/after/test.java deleted file mode 100644 index 815f0ed1ab3a..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t20/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - Map<String, String> f; - void foo() { - Set<String> s = f.keySet(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t20/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t20/before/test.java deleted file mode 100644 index 9609791bb138..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t20/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - HashMap<Integer, Integer> f; - void foo() { - Set<Integer> s = f.keySet(); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t21/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t21/after/Test.items deleted file mode 100644 index 53630275ac1c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t21/after/Test.items +++ /dev/null @@ -1,14 +0,0 @@ -Types: -PsiField:f : java.util.Map<java.lang.String,java.util.Set<java.lang.String>> -PsiLocalVariable:stringList : java.util.Set<java.lang.String> -PsiMethodCallExpression:f.get(s) : java.util.Set<java.lang.String> -PsiMethodCallExpression:stringList.add(s) : boolean -PsiReferenceExpression:f : java.util.Map<java.lang.String,java.util.Set<java.lang.String>> -PsiReferenceExpression:stringList : java.util.Set<java.lang.String> - -Conversions: -f.get(s) -> $ -stringList.add(s) -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t21/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t21/after/test.java deleted file mode 100644 index 34e758cb64d6..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t21/after/test.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.*; -class Test { - Map<String, Set<String>> f; - void foo(String s) { - Set<String> stringList = f.get(s); - stringList.add(s); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t21/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t21/before/test.java deleted file mode 100644 index 1f647aff2488..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t21/before/test.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.*; -class Test { - Map<String, List<String>> f; - void foo(String s) { - List<String> stringList = f.get(s); - stringList.add(s); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t22/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t22/after/Test.items deleted file mode 100644 index e8b61ea780ac..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t22/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiField:f : java.lang.Integer -PsiParameter:s : java.lang.Integer -PsiReferenceExpression:f : java.lang.Integer - -Conversions: -f -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t22/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t22/after/test.java deleted file mode 100644 index affc2b3da86f..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t22/after/test.java +++ /dev/null @@ -1,8 +0,0 @@ -class Test { - Integer f; - void foo(Integer s) {} - - void bar() { - foo(f); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t22/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t22/before/test.java deleted file mode 100644 index 24b0b43cb5a2..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t22/before/test.java +++ /dev/null @@ -1,8 +0,0 @@ -class Test { - String f; - void foo(String... s) {} - - void bar() { - foo(f); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t23/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t23/after/Test.items deleted file mode 100644 index 99507129472e..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t23/after/Test.items +++ /dev/null @@ -1,22 +0,0 @@ -Types: -PsiField:f : HashMap<java.lang.String,java.util.List<java.lang.String>> -PsiLocalVariable:set : java.util.List<java.lang.String> -PsiMethodCallExpression:f.get(s) : java.util.List<java.lang.String> -PsiMethodCallExpression:f.put(s, set) : java.util.List<java.lang.String> -PsiMethodCallExpression:set.add(s1) : boolean -PsiReferenceExpression:f : HashMap<java.lang.String,java.util.List<java.lang.String>> -PsiReferenceExpression:f : HashMap<java.lang.String,java.util.List<java.lang.String>> -PsiReferenceExpression:set : java.util.List<java.lang.String> -PsiReferenceExpression:set : java.util.List<java.lang.String> -PsiReferenceExpression:set : java.util.List<java.lang.String> -PsiReferenceExpression:set : java.util.List<java.lang.String> - -Conversions: -f.get(s) -> $ -f.put(s, set) -> $ -set -> $ -set.add(s1) -> $ - -New expression type changes: -Fails: -new HashSet<String>()->java.util.List<java.lang.String> diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t23/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t23/after/test.java deleted file mode 100644 index df9ad40dc0e9..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t23/after/test.java +++ /dev/null @@ -1,15 +0,0 @@ -import java.util.*; -class Test { - HashMap<String, List<String>> f; - - void foo(String s, String s1) { - List<String> set = f.get(s); - if (set == null) { - set = new HashSet<String>(); - f.put(s, set); - } - set.add(s1); - } -} - -class HashMap<K, V> extends java.util.HashMap<K, V>{}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t23/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t23/before/test.java deleted file mode 100644 index a99eafcc46dc..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t23/before/test.java +++ /dev/null @@ -1,15 +0,0 @@ -import java.util.*; -class Test { - HashMap<String, Set<String>> f; - - void foo(String s, String s1) { - Set<String> set = f.get(s); - if (set == null) { - set = new HashSet<String>(); - f.put(s, set); - } - set.add(s1); - } -} - -class HashMap<K, V> extends java.util.HashMap<K, V>{}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t24/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t24/after/Test.items deleted file mode 100644 index 21962d201ce2..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t24/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiField:f : D -PsiReferenceExpression:f : D - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t24/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t24/after/test.java deleted file mode 100644 index 6e0abdb55348..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t24/after/test.java +++ /dev/null @@ -1,14 +0,0 @@ -public class Test { - D f; - C foo() { - return null; - } -} -class B extends Test { - C foo() { - return f; - } -} - -class C {} -class D extends C{} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t24/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t24/before/test.java deleted file mode 100644 index 536dfc3ebd30..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t24/before/test.java +++ /dev/null @@ -1,14 +0,0 @@ -public class Test { - C f; - C foo() { - return null; - } -} -class B extends Test { - C foo() { - return f; - } -} - -class C {} -class D extends C{} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t25/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t25/after/Test.items deleted file mode 100644 index 21962d201ce2..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t25/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiField:f : D -PsiReferenceExpression:f : D - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t25/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t25/after/test.java deleted file mode 100644 index b06e456332d8..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t25/after/test.java +++ /dev/null @@ -1,15 +0,0 @@ -public class Test { - D f; - C foo() { - return f; - } -} - -class B extends Test { - C foo() { - return null; - } -} - -class C {} -class D extends C{} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t25/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t25/before/test.java deleted file mode 100644 index 2994877fade8..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t25/before/test.java +++ /dev/null @@ -1,15 +0,0 @@ -public class Test { - C f; - C foo() { - return f; - } -} - -class B extends Test { - C foo() { - return null; - } -} - -class C {} -class D extends C{} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t26/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t26/after/Test.items deleted file mode 100644 index eae7ba330dd9..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t26/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiField:f : D -PsiParameter:c : D -PsiParameter:c : D -PsiReferenceExpression:c : D -PsiReferenceExpression:f : D - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t26/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t26/after/test.java deleted file mode 100644 index ee47caa11464..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t26/after/test.java +++ /dev/null @@ -1,15 +0,0 @@ -class Test { - D f; - void foo(D c) { - f = c; - } -} - -class B extends Test { - void foo(D c) { - - } -} - -class C {} -class D extends C{}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t26/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t26/before/test.java deleted file mode 100644 index 581f5fa3bc83..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t26/before/test.java +++ /dev/null @@ -1,15 +0,0 @@ -class Test { - C f; - void foo(C c) { - f = c; - } -} - -class B extends Test { - void foo(C c) { - - } -} - -class C {} -class D extends C{}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t27/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t27/after/Test.items deleted file mode 100644 index eae7ba330dd9..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t27/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiField:f : D -PsiParameter:c : D -PsiParameter:c : D -PsiReferenceExpression:c : D -PsiReferenceExpression:f : D - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t27/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t27/after/test.java deleted file mode 100644 index 5eb0cb2d97b9..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t27/after/test.java +++ /dev/null @@ -1,13 +0,0 @@ -class Test { - D f; - void foo(D c) {} -} - -class B extends Test { - void foo(D c) { - f = c; - } -} - -class C {} -class D extends C{}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t27/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t27/before/test.java deleted file mode 100644 index a18da122856d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t27/before/test.java +++ /dev/null @@ -1,13 +0,0 @@ -class Test { - C f; - void foo(C c) {} -} - -class B extends Test { - void foo(C c) { - f = c; - } -} - -class C {} -class D extends C{}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t28/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t28/after/Test.items deleted file mode 100644 index 80d6c0c3bf37..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t28/after/Test.items +++ /dev/null @@ -1,13 +0,0 @@ -Types: -PsiField:f : java.lang.String[] -PsiMethodCallExpression:f.size() : int -PsiMethodCallExpression:f.toArray(new String[f.size()]) : java.lang.String[] -PsiReferenceExpression:f : java.lang.String[] -PsiReferenceExpression:f : java.lang.String[] - -Conversions: -f.size() -> $qualifier$.length $qualifier$.size() -f.toArray(new String[f.size()]) -> $qualifier$ $qualifier$.toArray($expr$) - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t28/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t28/after/test.java deleted file mode 100644 index 0b1e27daa0ee..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t28/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - String[] f; - String[] get() { - return f; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t28/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t28/before/test.java deleted file mode 100644 index 43c040a3baf4..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t28/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - List<String> f; - String[] get() { - return f.toArray(new String[f.size()]); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t29/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t29/after/Test.items deleted file mode 100644 index 5b040a6aaa19..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t29/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiMethod:get : java.util.List<java.lang.String> - -Conversions: -f.toArray(new String[f.size()]) -> $qualifier$ $qualifier$.toArray($expr$) - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t29/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t29/after/test.java deleted file mode 100644 index 23a1f11f461e..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t29/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - List<String> f; - List<String> get() { - return f; - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t29/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t29/before/test.java deleted file mode 100644 index 43c040a3baf4..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t29/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - List<String> f; - String[] get() { - return f.toArray(new String[f.size()]); - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t30/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t30/after/Test.items deleted file mode 100644 index cfd748933e5d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t30/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiField:f : java.lang.String[] -PsiMethodCallExpression:f.size() : int -PsiReferenceExpression:f : java.lang.String[] - -Conversions: -f.size() -> $qualifier$.length $qualifier$.size() - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t30/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t30/after/test.java deleted file mode 100644 index 28f71fc98c82..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t30/after/test.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.*; -class Test { - String[] f; - void foo() { - for (int i = 0; i < f.length; i++) { - - } - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t30/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t30/before/test.java deleted file mode 100644 index 5317e2164e7b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t30/before/test.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.*; -class Test { - List<String> f; - void foo() { - for (int i = 0; i < f.size(); i++) { - - } - } -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t31/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t31/after/Test.items deleted file mode 100644 index 7459a22f27d0..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t31/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:f : java.lang.Object -PsiReferenceExpression:f : java.lang.Object - -Conversions: - -New expression type changes: -Fails: -f->java.lang.Object diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t31/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t31/after/test.java deleted file mode 100644 index ec7fb8e9807d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t31/after/test.java +++ /dev/null @@ -1,8 +0,0 @@ -class Test { - Object f; - void foo(){} - - void bar() { - f.foo(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t31/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t31/before/test.java deleted file mode 100644 index b8c08fdfd786..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t31/before/test.java +++ /dev/null @@ -1,8 +0,0 @@ -class Test { - Test f; - void foo(){} - - void bar() { - f.foo(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t32/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t32/after/Test.items deleted file mode 100644 index 5638ea15f4a6..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t32/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiParameter:i : int - -Conversions: -#bar(long) -> PsiMethod:bar - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t32/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t32/after/test.java deleted file mode 100644 index 27e7eeb25258..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t32/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -/** -* {@link #bar(int)} -*/ -class Test { - - void bar(int i) {} -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t32/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t32/before/test.java deleted file mode 100644 index a98179d5054c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t32/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -/** -* {@link #bar(long)} -*/ -class Test { - - void bar(long i) {} -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t33/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t33/after/Test.items deleted file mode 100644 index df8f4d2c09d4..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t33/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiField:l : java.util.List<java.lang.Integer> -PsiNewExpression:new ArrayList<String>() : java.util.ArrayList<java.lang.Integer> -PsiReferenceExpression:l : java.util.List<java.lang.Integer> - -Conversions: - -New expression type changes: -new ArrayList<String>() -> java.util.ArrayList<java.lang.Integer> -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t33/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t33/after/test.java deleted file mode 100644 index 126292ad9322..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t33/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - List<Integer> l; - void foo() { - l = new ArrayList<>(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t33/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t33/before/test.java deleted file mode 100644 index f604f9185e2d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t33/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - List<String> l; - void foo() { - l = new ArrayList<String>(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t34/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t34/after/Test.items deleted file mode 100644 index d9f0bafc62d7..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t34/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiField:l : java.util.AbstractList<java.lang.String> -PsiNewExpression:new ArrayList<String>() : java.util.ArrayList<java.lang.String> -PsiReferenceExpression:l : java.util.AbstractList<java.lang.String> - -Conversions: - -New expression type changes: -new ArrayList<String>() -> java.util.ArrayList<java.lang.String> -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t34/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t34/after/test.java deleted file mode 100644 index 954f507013c6..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t34/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - AbstractList<String> l; - void foo() { - l = new ArrayList<>(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t34/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t34/before/test.java deleted file mode 100644 index f604f9185e2d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t34/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - List<String> l; - void foo() { - l = new ArrayList<String>(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t35/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t35/after/Test.items deleted file mode 100644 index 2b28dc8c0984..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t35/after/Test.items +++ /dev/null @@ -1,12 +0,0 @@ -Types: -PsiField:myParent : TestImpl -PsiParameter:parent : TestImpl -PsiParameter:parent : TestImpl -PsiReferenceExpression:myParent : TestImpl -PsiReferenceExpression:parent : TestImpl -PsiReferenceExpression:parent : TestImpl - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t35/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t35/after/test.java deleted file mode 100644 index b575a53519c4..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t35/after/test.java +++ /dev/null @@ -1,13 +0,0 @@ -class Test { - TestImpl myParent; - - public Test(TestImpl parent) { - myParent = parent; - } - - class TestImpl extends Test { - public TestImpl(TestImpl parent) { - super(parent); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t35/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t35/before/test.java deleted file mode 100644 index 83f66b0bea7c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t35/before/test.java +++ /dev/null @@ -1,13 +0,0 @@ -class Test { - Test myParent; - - public Test(Test parent) { - myParent = parent; - } - - class TestImpl extends Test { - public TestImpl(Test parent) { - super(parent); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t36/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t36/after/Test.items deleted file mode 100644 index 521251a0dd37..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t36/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiParameter:i : byte -PsiReferenceExpression:i : byte - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t36/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t36/after/test.java deleted file mode 100644 index 8fd62fdc775d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t36/after/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - void foo(byte i) { - long j = i; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t36/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t36/before/test.java deleted file mode 100644 index 1cbff3a1272c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t36/before/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - void foo(int i) { - long j = i; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t37/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t37/after/Test.items deleted file mode 100644 index 26c064a26ffa..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t37/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiParameter:i : int -PsiReferenceExpression:i : int -PsiReferenceExpression:i : int -PsiReferenceExpression:i : int - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t37/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t37/after/test.java deleted file mode 100644 index 032dc398e040..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t37/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -class Test { - void foo(int i) { - int i1 = i + 1; - int i2 = i - 1; - int i3 = i >> 1; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t37/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t37/before/test.java deleted file mode 100644 index 2cc80bd340ed..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t37/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -class Test { - void foo(short i) { - int i1 = i + 1; - int i2 = i - 1; - int i3 = i >> 1; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t38/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t38/after/Test.items deleted file mode 100644 index ce5df8ea5fcb..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t38/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiParameter:i : long -PsiReferenceExpression:i : long -PsiReferenceExpression:i : long -PsiReferenceExpression:i : long - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t38/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t38/after/test.java deleted file mode 100644 index 7ef08a9041c0..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t38/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -class Test { - void foo(long i) { - int i1 = i + 1; - int i2 = i - 1; - int i3 = i >> 1; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t38/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t38/before/test.java deleted file mode 100644 index 7ef08a9041c0..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t38/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -class Test { - void foo(long i) { - int i1 = i + 1; - int i2 = i - 1; - int i3 = i >> 1; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t39/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t39/after/Test.items deleted file mode 100644 index 3c746805c0f1..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t39/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiParameter:i : byte -PsiReferenceExpression:i : byte -PsiReferenceExpression:i : byte -PsiReferenceExpression:i : byte - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t39/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t39/after/test.java deleted file mode 100644 index 0b59f99cc084..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t39/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -class Test { - void foo(byte i) { - int i1 = i + 1; - int i2 = i - 1; - int i3 = i >> 1; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t39/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t39/before/test.java deleted file mode 100644 index 7ef08a9041c0..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t39/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -class Test { - void foo(long i) { - int i1 = i + 1; - int i2 = i - 1; - int i3 = i >> 1; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t40/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t40/after/Test.items deleted file mode 100644 index 2aff3bd8c623..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t40/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiField:l : java.util.ArrayList -PsiReferenceExpression:l : java.util.ArrayList - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t40/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t40/after/test.java deleted file mode 100644 index 83cae108fdd9..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t40/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - ArrayList l; - void foo() { - l = new ArrayList(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t40/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t40/before/test.java deleted file mode 100644 index dd72766db414..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t40/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - List l; - void foo() { - l = new ArrayList(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t41/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t41/after/Test.items deleted file mode 100644 index 583812d7778b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t41/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiField:l : java.util.ArrayList -PsiNewExpression:new ArrayList<String>() : java.util.ArrayList<java.lang.String> -PsiReferenceExpression:l : java.util.ArrayList - -Conversions: - -New expression type changes: -new ArrayList<String>() -> java.util.ArrayList<java.lang.String> -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t41/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t41/after/test.java deleted file mode 100644 index 3ac0475a9e96..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t41/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - ArrayList l; - void foo() { - l = new ArrayList<String>(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t41/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t41/before/test.java deleted file mode 100644 index 8b8b5018717b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t41/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - List l; - void foo() { - l = new ArrayList<String>(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t42/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t42/after/Test.items deleted file mode 100644 index d1417fa9ad32..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t42/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiField:l : java.util.ArrayList<java.lang.String> -PsiNewExpression:new ArrayList() : java.util.ArrayList -PsiReferenceExpression:l : java.util.ArrayList<java.lang.String> - -Conversions: - -New expression type changes: -new ArrayList() -> java.util.ArrayList -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t42/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t42/after/test.java deleted file mode 100644 index 0dd8c405b1d9..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t42/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - ArrayList<String> l; - void foo() { - l = new ArrayList(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t42/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t42/before/test.java deleted file mode 100644 index dd72766db414..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t42/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; -class Test { - List l; - void foo() { - l = new ArrayList(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t43/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t43/after/Test.items deleted file mode 100644 index b1e94aa2143b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t43/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiField:o : java.lang.Long - -Conversions: -l -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t43/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t43/after/test.java deleted file mode 100644 index c386bc247acd..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t43/after/test.java +++ /dev/null @@ -1,4 +0,0 @@ -class Test { - long l; - Long o = l; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t43/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t43/before/test.java deleted file mode 100644 index d7e1595d92bb..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t43/before/test.java +++ /dev/null @@ -1,4 +0,0 @@ -class Test { - long l; - Object o = l; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t44/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t44/after/Test.items deleted file mode 100644 index 3cae6713c3b0..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t44/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:i : byte -PsiReferenceExpression:i : byte - -Conversions: -l -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t44/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t44/after/test.java deleted file mode 100644 index 60a560399b71..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t44/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -class Test { - long l; - byte i; - void foo() { - l = i; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t44/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t44/before/test.java deleted file mode 100644 index 4dee20b44e33..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t44/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -class Test { - long l; - int i; - void foo() { - l = i; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t45/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t45/after/Test.items deleted file mode 100644 index c97169454693..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t45/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiField:i : byte -PsiField:l : byte -PsiReferenceExpression:i : byte -PsiReferenceExpression:l : byte - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t45/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t45/after/test.java deleted file mode 100644 index 45fcb1f6eb1f..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t45/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -class Test { - byte l; - byte i; - void foo() { - l = i; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t45/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t45/before/test.java deleted file mode 100644 index 4dee20b44e33..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t45/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -class Test { - long l; - int i; - void foo() { - l = i; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t46/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t46/after/Test.items deleted file mode 100644 index 934d4a09ec3b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t46/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiField:j : int - -Conversions: -i -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t46/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t46/after/test.java deleted file mode 100644 index f77f19689836..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t46/after/test.java +++ /dev/null @@ -1,4 +0,0 @@ -class Test { - byte i; - int j = i; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t46/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t46/before/test.java deleted file mode 100644 index 5256726fdd95..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t46/before/test.java +++ /dev/null @@ -1,4 +0,0 @@ -class Test { - byte i; - long j = i; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t47/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t47/after/Test.items deleted file mode 100644 index d39a160ee9a7..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t47/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiField:o : int - -Conversions: - -New expression type changes: -Fails: -null->int diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t47/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t47/after/test.java deleted file mode 100644 index 99f4d773fd24..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t47/after/test.java +++ /dev/null @@ -1,3 +0,0 @@ -class Test { - int o = null; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t47/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t47/before/test.java deleted file mode 100644 index 308305e1cb41..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t47/before/test.java +++ /dev/null @@ -1,3 +0,0 @@ -class Test { - Object o = null; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t48/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t48/after/Test.items deleted file mode 100644 index fedb3311ad6b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t48/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiLocalVariable:set : java.util.Set<B> -PsiParameter:s : java.util.AbstractSet<B> -PsiReferenceExpression:s : java.util.AbstractSet<B> - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t48/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t48/after/test.java deleted file mode 100644 index 60e1a9ddd8c7..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t48/after/test.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.*; -class Test { - void foo(AbstractSet<B> s) { - Set<B> set = s; - } - - class A {} - class B extends A{} -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t48/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t48/before/test.java deleted file mode 100644 index e859716610c8..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t48/before/test.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.*; -class Test { - void foo(AbstractSet<A> s) { - Set<A> set = s; - } - - class A {} - class B extends A{} -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t49/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t49/after/Test.items deleted file mode 100644 index b65d6bce02d1..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t49/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiField:f : java.util.Set<B> -PsiParameter:s : java.util.AbstractSet<B> -PsiReferenceExpression:f : java.util.Set<B> -PsiReferenceExpression:s : java.util.AbstractSet<B> - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t49/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t49/after/test.java deleted file mode 100644 index 91c41afa26e2..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t49/after/test.java +++ /dev/null @@ -1,10 +0,0 @@ -import java.util.*; -class Test { - Set<B> f; - void foo(AbstractSet<B> s) { - f = s; - } - - class A {} - class B extends A{} -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t49/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t49/before/test.java deleted file mode 100644 index 8a2a9a9054ce..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t49/before/test.java +++ /dev/null @@ -1,10 +0,0 @@ -import java.util.*; -class Test { - Set<A> f; - void foo(AbstractSet<A> s) { - f = s; - } - - class A {} - class B extends A{} -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t50/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t50/after/Test.items deleted file mode 100644 index 895bdd4d4118..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t50/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:c : java.util.Set<? extends JButton> -PsiField:c1 : java.util.Set<? extends JButton> -PsiReferenceExpression:c : java.util.Set<? extends JButton> - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t50/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t50/after/test.java deleted file mode 100644 index 50d5fb0229ca..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t50/after/test.java +++ /dev/null @@ -1,5 +0,0 @@ -import java.util.*; -class Test { - Set<? extends JButton> c; - Set<? extends JButton> c1 = c; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t50/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t50/before/test.java deleted file mode 100644 index 05b20ee8b1fe..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t50/before/test.java +++ /dev/null @@ -1,5 +0,0 @@ -import java.util.*; -class Test { - Set<? extends JComponent> c; - Set<? extends JComponent> c1 = c; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t51/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t51/after/Test.items deleted file mode 100644 index 81f430c2e8ab..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t51/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiField:f : java.lang.Object[] -PsiNewExpression:new String[] {"a"} : java.lang.Object[] - -Conversions: -"a" -> $ - -New expression type changes: -new String[] {"a"} -> java.lang.Object[] -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t51/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t51/after/test.java deleted file mode 100644 index bbd211f73928..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t51/after/test.java +++ /dev/null @@ -1,3 +0,0 @@ -class Test { - Object[] f = new Object[] {"a"}; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t51/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t51/before/test.java deleted file mode 100644 index 7a9a090c342f..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t51/before/test.java +++ /dev/null @@ -1,3 +0,0 @@ -class Test { - String[] f = new String[] {"a"}; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t52/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t52/after/Test.items deleted file mode 100644 index fae3f5aa0b83..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t52/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiField:f : java.lang.Object[] -PsiNewExpression:new Set() : java.util.Set -PsiNewExpression:new Set[] { new Set() } : java.lang.Object[] - -Conversions: - -New expression type changes: -new Set() -> java.util.Set -new Set[] { new Set() } -> java.lang.Object[] -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t52/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t52/after/test.java deleted file mode 100644 index 034f9e2a7285..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t52/after/test.java +++ /dev/null @@ -1,4 +0,0 @@ -import java.util.*; -class Test { - Object[] f = new Object[] { new Set() }; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t52/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t52/before/test.java deleted file mode 100644 index abf3b7a12aff..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t52/before/test.java +++ /dev/null @@ -1,4 +0,0 @@ -import java.util.*; -class Test { - Set[] f = new Set[] { new Set() }; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t53/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t53/after/Test.items deleted file mode 100644 index 6f10a470aef3..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t53/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiField:f : java.util.Set<java.lang.String>[] - -Conversions: - -New expression type changes: -Fails: -new double[0]->java.util.Set<java.lang.String>[] diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t53/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t53/after/test.java deleted file mode 100644 index 52d1899803c8..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t53/after/test.java +++ /dev/null @@ -1,4 +0,0 @@ -import java.util.*; -class Test { - Set<String>[] f = new double[0]; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t53/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t53/before/test.java deleted file mode 100644 index 50be5aada106..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t53/before/test.java +++ /dev/null @@ -1,4 +0,0 @@ -import java.util.*; -class Test { - double[] f = new double[0]; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t54/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t54/after/Test.items deleted file mode 100644 index 584021476055..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t54/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:f : java.util.Set<? extends java.lang.Integer> -PsiNewExpression:new Set<Object>() : java.util.Set<java.lang.Integer> - -Conversions: - -New expression type changes: -new Set<Object>() -> java.util.Set<java.lang.Integer> -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t54/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t54/after/test.java deleted file mode 100644 index 11cbc3fe7520..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t54/after/test.java +++ /dev/null @@ -1,4 +0,0 @@ -import java.util.*; -class Test { - Set<? extends Integer> f = new Set<>(); -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t54/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t54/before/test.java deleted file mode 100644 index 96573db084dd..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t54/before/test.java +++ /dev/null @@ -1,4 +0,0 @@ -import java.util.*; -class Test { - Set<Object> f = new Set<Object>(); -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t55/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t55/after/Test.items deleted file mode 100644 index 465e20e4a213..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t55/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:f : java.util.Set<?> -PsiNewExpression:new Set<Object>() : java.util.Set<java.lang.Object> - -Conversions: - -New expression type changes: -new Set<Object>() -> java.util.Set<java.lang.Object> -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t55/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t55/after/test.java deleted file mode 100644 index c895ff398fa6..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t55/after/test.java +++ /dev/null @@ -1,4 +0,0 @@ -import java.util.*; -class Test { - Set<?> f = new Set<>(); -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t55/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t55/before/test.java deleted file mode 100644 index 96573db084dd..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t55/before/test.java +++ /dev/null @@ -1,4 +0,0 @@ -import java.util.*; -class Test { - Set<Object> f = new Set<Object>(); -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t56/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t56/after/Test.items deleted file mode 100644 index 05ed851f0ce0..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t56/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiParameter:i : double -PsiReferenceExpression:i : double -PsiReferenceExpression:i : double - -Conversions: - -New expression type changes: -Fails: -i->double -i->double diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t56/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t56/after/test.java deleted file mode 100644 index 2f5cc73acbbb..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t56/after/test.java +++ /dev/null @@ -1,6 +0,0 @@ -class Test { - void foo(double i) { - int[] a = new int[i]; - System.out.println(a[i]); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t56/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t56/before/test.java deleted file mode 100644 index 0f9888806c18..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t56/before/test.java +++ /dev/null @@ -1,6 +0,0 @@ -class Test { - void foo(int i) { - int[] a = new int[i]; - System.out.println(a[i]); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t57/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t57/after/Test.items deleted file mode 100644 index af2ecf9c114e..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t57/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:i : byte -PsiReferenceExpression:i : byte -PsiReferenceExpression:i : byte - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t57/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t57/after/test.java deleted file mode 100644 index ce9df2fbb45d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t57/after/test.java +++ /dev/null @@ -1,6 +0,0 @@ -class Test { - void foo(byte i) { - int[] a = new int[i]; - System.out.println(a[i]); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t57/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t57/before/test.java deleted file mode 100644 index 0f9888806c18..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t57/before/test.java +++ /dev/null @@ -1,6 +0,0 @@ -class Test { - void foo(int i) { - int[] a = new int[i]; - System.out.println(a[i]); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t58/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t58/after/Test.items deleted file mode 100644 index 19b07a44c139..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t58/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiField:f : java.lang.Object - -Conversions: -new String[1] -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t58/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t58/after/test.java deleted file mode 100644 index ff4055ac3129..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t58/after/test.java +++ /dev/null @@ -1,3 +0,0 @@ -class Test { - Object f = new String[1]; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t58/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t58/before/test.java deleted file mode 100644 index 8df4d62d721a..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t58/before/test.java +++ /dev/null @@ -1,3 +0,0 @@ -class Test { - String[] f = new String[1]; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t59/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t59/after/Test.items deleted file mode 100644 index ea0dda8061b2..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t59/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiField:f : java.lang.Cloneable - -Conversions: -new String[1] -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t59/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t59/after/test.java deleted file mode 100644 index 78a09afee42b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t59/after/test.java +++ /dev/null @@ -1,3 +0,0 @@ -class Test { - Cloneable f = new String[1]; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t59/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t59/before/test.java deleted file mode 100644 index 8df4d62d721a..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t59/before/test.java +++ /dev/null @@ -1,3 +0,0 @@ -class Test { - String[] f = new String[1]; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t60/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t60/after/Test.items deleted file mode 100644 index 88822343977c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t60/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:p : java.lang.Object -PsiReferenceExpression:p : java.lang.Object - -Conversions: -i -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t60/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t60/after/test.java deleted file mode 100644 index 9ab940eaf425..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t60/after/test.java +++ /dev/null @@ -1,6 +0,0 @@ -class Test { - Object p; - void foo(int... i) { - p = i; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t60/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t60/before/test.java deleted file mode 100644 index 26172c13d2e7..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t60/before/test.java +++ /dev/null @@ -1,6 +0,0 @@ -class Test { - int[] p; - void foo(int... i) { - p = i; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t61/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t61/after/Test.items deleted file mode 100644 index 830074d65d6b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t61/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiLocalVariable:p : int[] -PsiParameter:i : int... -PsiReferenceExpression:i : int[] - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t61/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t61/after/test.java deleted file mode 100644 index 1b05fce5b5b9..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t61/after/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - void foo(int... i) { - int[] p = i; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t61/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t61/before/test.java deleted file mode 100644 index e9f49f1c3846..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t61/before/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - void foo(int i) { - int p = i; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t62/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t62/after/Test.items deleted file mode 100644 index 88822343977c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t62/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:p : java.lang.Object -PsiReferenceExpression:p : java.lang.Object - -Conversions: -i -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t62/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t62/after/test.java deleted file mode 100644 index 9ab940eaf425..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t62/after/test.java +++ /dev/null @@ -1,6 +0,0 @@ -class Test { - Object p; - void foo(int... i) { - p = i; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t62/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t62/before/test.java deleted file mode 100644 index 26172c13d2e7..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t62/before/test.java +++ /dev/null @@ -1,6 +0,0 @@ -class Test { - int[] p; - void foo(int... i) { - p = i; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t63/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t63/after/Test.items deleted file mode 100644 index 69dcdaf945c5..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t63/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiField:p : double[] -PsiParameter:i : double[] -PsiReferenceExpression:i : double[] -PsiReferenceExpression:p : double[] - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t63/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t63/after/test.java deleted file mode 100644 index 9602f0b3d59f..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t63/after/test.java +++ /dev/null @@ -1,6 +0,0 @@ -class Test { - double[] p; - void foo(double[] i) { - p = i; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t63/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t63/before/test.java deleted file mode 100644 index 26172c13d2e7..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t63/before/test.java +++ /dev/null @@ -1,6 +0,0 @@ -class Test { - int[] p; - void foo(int... i) { - p = i; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t64/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t64/after/Test.items deleted file mode 100644 index 8ae72a21d857..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t64/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiLocalVariable:p : int -PsiParameter:i : int -PsiReferenceExpression:i : int - -Conversions: - -New expression type changes: -Fails: -foo(1, 2)->int diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t64/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t64/after/test.java deleted file mode 100644 index 29f4004383eb..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t64/after/test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - void foo(int i) { - int p = i; - } - - void bar() { - foo(1, 2); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t64/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t64/before/test.java deleted file mode 100644 index 5583e3c06a5d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t64/before/test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - void foo(int... i) { - int[] p = i; - } - - void bar() { - foo(1, 2); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t65/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t65/after/Test.items deleted file mode 100644 index a1201587163f..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t65/after/Test.items +++ /dev/null @@ -1,12 +0,0 @@ -Types: -PsiLocalVariable:p : java.lang.String -PsiParameter:i : java.lang.String -PsiReferenceExpression:i : java.lang.String - -Conversions: - -New expression type changes: -Fails: -1->java.lang.String -2->java.lang.String -foo(1, 2)->java.lang.String diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t65/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t65/after/test.java deleted file mode 100644 index 3532ce557f8c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t65/after/test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - void foo(String i) { - String p = i; - } - - void bar() { - foo(1, 2); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t65/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t65/before/test.java deleted file mode 100644 index 5583e3c06a5d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t65/before/test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - void foo(int... i) { - int[] p = i; - } - - void bar() { - foo(1, 2); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t66/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t66/after/Test.items deleted file mode 100644 index f8bf3a92ff7d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t66/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiLocalVariable:p : int -PsiParameter:i : int -PsiReferenceExpression:i : int - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t66/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t66/after/test.java deleted file mode 100644 index 56608039cf5e..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t66/after/test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - void foo(int i) { - int p = i; - } - - void bar() { - foo(1); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t66/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t66/before/test.java deleted file mode 100644 index 45ea51dddf11..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t66/before/test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - void foo(int... i) { - int[] p = i; - } - - void bar() { - foo(1); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t67/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t67/after/Test.items deleted file mode 100644 index 0e5e72eb6f30..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t67/after/Test.items +++ /dev/null @@ -1,12 +0,0 @@ -Types: -PsiField:myForAccess : java.lang.String -PsiMethod:forAccess : java.lang.String -PsiMethodCallExpression:this.forAccess() : java.lang.String -PsiParameter:p : java.lang.String -PsiReferenceExpression:myForAccess : java.lang.String -PsiReferenceExpression:p : java.lang.String - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t67/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t67/after/test.java deleted file mode 100644 index 8a4fda4a0fac..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t67/after/test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - private String myForAccess; - private String forAccess() { - return myForAccess; - } - public void methMemAcc(String p) { - p = this.forAccess(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t67/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t67/before/test.java deleted file mode 100644 index 57a1c5db091b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t67/before/test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - private Object myForAccess; - private Object forAccess() { - return myForAccess; - } - public void methMemAcc(Object p) { - p = this.forAccess(); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t68/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t68/after/Test.items deleted file mode 100644 index e31709e870fb..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t68/after/Test.items +++ /dev/null @@ -1,17 +0,0 @@ -Types: -PsiArrayInitializerExpression:{p} : double[] -PsiArrayInitializerExpression:{p} : double[] -PsiArrayInitializerExpression:{{p},{p}} : double[][] -PsiLocalVariable:a : double[][] -PsiNewExpression:new int[][]{{p},{p}} : double[][] -PsiParameter:p : double -PsiReferenceExpression:p : double -PsiReferenceExpression:p : double - -Conversions: -p -> $ -p -> $ - -New expression type changes: -new int[][]{{p},{p}} -> double[][] -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t68/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t68/after/test.java deleted file mode 100644 index f9d9a9257c5d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t68/after/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - public void foo(double p) { - double[][] a = new double[][]{{p},{p}}; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t68/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t68/before/test.java deleted file mode 100644 index 9f84d15cc993..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t68/before/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - public void foo(int p) { - int[][] a = new int[][]{{p},{p}}; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t69/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t69/after/Test.items deleted file mode 100644 index 6471629f221e..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t69/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:p : byte -PsiReferenceExpression:p : byte -PsiReferenceExpression:p : byte - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t69/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t69/after/test.java deleted file mode 100644 index bba00df7f5ed..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t69/after/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - public void foo(byte p) { - int[][] a = new int[][]{{p},{p}}; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t69/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t69/before/test.java deleted file mode 100644 index 9f84d15cc993..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t69/before/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - public void foo(int p) { - int[][] a = new int[][]{{p},{p}}; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t70/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t70/after/Test.items deleted file mode 100644 index 9811dea4870e..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t70/after/Test.items +++ /dev/null @@ -1,18 +0,0 @@ -Types: -PsiArrayInitializerExpression:{p} : float[] -PsiArrayInitializerExpression:{p} : float[] -PsiArrayInitializerExpression:{{p}, {p}} : float[][] -PsiField:a : float[][] -PsiNewExpression:new int[][]{{p}, {p}} : float[][] -PsiParameter:p : float -PsiReferenceExpression:a : float[][] -PsiReferenceExpression:p : float -PsiReferenceExpression:p : float - -Conversions: -p -> $ -p -> $ - -New expression type changes: -new int[][]{{p}, {p}} -> float[][] -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t70/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t70/after/test.java deleted file mode 100644 index 7ef5f832a7d9..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t70/after/test.java +++ /dev/null @@ -1,6 +0,0 @@ -class Test { - float[][] a; - public void foo(float p) { - a = new float[][]{{p}, {p}}; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t70/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t70/before/test.java deleted file mode 100644 index d98804a2576f..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t70/before/test.java +++ /dev/null @@ -1,6 +0,0 @@ -class Test { - int[][] a; - public void foo(int p) { - a = new int[][]{{p}, {p}}; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t71/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t71/after/Test.items deleted file mode 100644 index f65db392b622..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t71/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiField:f : java.lang.Class<? extends java.lang.Number> - -Conversions: -byte.class -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t71/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t71/after/test.java deleted file mode 100644 index be0143bbaafb..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t71/after/test.java +++ /dev/null @@ -1,3 +0,0 @@ -class Test { - Class<? extends Number> f = byte.class; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t71/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t71/before/test.java deleted file mode 100644 index e3c0a3aecee2..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t71/before/test.java +++ /dev/null @@ -1,3 +0,0 @@ -class Test { - Class f = byte.class; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t72/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t72/after/Test.items deleted file mode 100644 index cacd1729289d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t72/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiField:f : java.lang.Class<java.lang.Integer> - -Conversions: - -New expression type changes: -Fails: -byte.class->java.lang.Class<java.lang.Integer> diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t72/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t72/after/test.java deleted file mode 100644 index ace9fbcc92a8..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t72/after/test.java +++ /dev/null @@ -1,3 +0,0 @@ -class Test { - Class<Integer> f = byte.class; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t72/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t72/before/test.java deleted file mode 100644 index e3c0a3aecee2..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t72/before/test.java +++ /dev/null @@ -1,3 +0,0 @@ -class Test { - Class f = byte.class; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t73/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t73/after/Test.items deleted file mode 100644 index f46b39d67281..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t73/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiArrayInitializerExpression:{} : java.util.Set<java.awt.Component>[] -PsiField:f : java.util.Set<java.awt.Component>[][] - -Conversions: - -New expression type changes: -Fails: -new Set[][]{{}}->java.util.Set<java.awt.Component>[][] diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t73/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t73/after/test.java deleted file mode 100644 index da9d9b2e6fe8..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t73/after/test.java +++ /dev/null @@ -1,6 +0,0 @@ -import java.util.*; -import javax.swing.*; -import java.awt.*; -class Test { - Set<Component>[][] f = new Set[][]{{}}; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t73/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t73/before/test.java deleted file mode 100644 index b07764b2c29f..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t73/before/test.java +++ /dev/null @@ -1,6 +0,0 @@ -import java.util.*; -import javax.swing.*; -import java.awt.*; -class Test { - Set<JComponent>[][] f = new Set[][]{{}}; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t74/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t74/after/Test.items deleted file mode 100644 index 236f769a7b98..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t74/after/Test.items +++ /dev/null @@ -1,22 +0,0 @@ -Types: -PsiLocalVariable:v1 : float -PsiLocalVariable:v2 : float -PsiLocalVariable:v3 : float -PsiLocalVariable:v4 : float -PsiLocalVariable:vu1 : float -PsiLocalVariable:vu2 : float -PsiLocalVariable:vu3 : float -PsiParameter:pi : float -PsiReferenceExpression:pi : float -PsiReferenceExpression:pi : float -PsiReferenceExpression:pi : float -PsiReferenceExpression:pi : float -PsiReferenceExpression:pi : float -PsiReferenceExpression:pi : float -PsiReferenceExpression:pi : float - -Conversions: - -New expression type changes: -Fails: -~pi->float diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t74/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t74/after/test.java deleted file mode 100644 index 25d776d7d8c6..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t74/after/test.java +++ /dev/null @@ -1,11 +0,0 @@ -class Test { - public void meth(float pi) { - float v1 = pi++; - float v2 = pi--; - float v3 = ++pi; - float v4 = --pi; - float vu1 = -pi; - float vu2 = +pi; - float vu3 = ~pi; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t74/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t74/before/test.java deleted file mode 100644 index c6e83eedc1bd..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t74/before/test.java +++ /dev/null @@ -1,11 +0,0 @@ -class Test { - public void meth(int pi) { - int v1 = pi++; - int v2 = pi--; - int v3 = ++pi; - int v4 = --pi; - int vu1 = -pi; - int vu2 = +pi; - int vu3 = ~pi; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t75/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t75/after/Test.items deleted file mode 100644 index 9c3eb7b369e3..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t75/after/Test.items +++ /dev/null @@ -1,38 +0,0 @@ -Types: -PsiLocalVariable:vn4 : java.lang.String -PsiParameter:pn : java.lang.String -PsiReferenceExpression:pn : java.lang.String -PsiReferenceExpression:pn : java.lang.String -PsiReferenceExpression:pn : java.lang.String -PsiReferenceExpression:pn : java.lang.String -PsiReferenceExpression:pn : java.lang.String -PsiReferenceExpression:pn : java.lang.String -PsiReferenceExpression:pn : java.lang.String -PsiReferenceExpression:pn : java.lang.String -PsiReferenceExpression:pn : java.lang.String -PsiReferenceExpression:pn : java.lang.String -PsiReferenceExpression:pn : java.lang.String -PsiReferenceExpression:pn : java.lang.String -PsiReferenceExpression:pn : java.lang.String -PsiReferenceExpression:pn : java.lang.String -PsiReferenceExpression:pn : java.lang.String -PsiReferenceExpression:pn : java.lang.String - -Conversions: - -New expression type changes: -Fails: -pn->java.lang.String -pn->java.lang.String -pn->java.lang.String -pn->java.lang.String -pn->java.lang.String -pn->java.lang.String -pn->java.lang.String -pn->java.lang.String -pn->java.lang.String -pn->java.lang.String -pn->java.lang.String -pn->java.lang.String -pn->java.lang.String -pn->java.lang.String diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t75/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t75/after/test.java deleted file mode 100644 index 750c3d1d51a4..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t75/after/test.java +++ /dev/null @@ -1,12 +0,0 @@ -class Test { - public void meth(String pn) { - int vn1 = pn * pn; - int vn2 = pn / pn; - int vn3 = pn % pn; - String vn4 = pn + pn; - int vn5 = pn - pn; - int vn6 = pn << pn; - int vn7 = pn >> pn; - int vn8 = pn >>> pn; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t75/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t75/before/test.java deleted file mode 100644 index fdde94165b43..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t75/before/test.java +++ /dev/null @@ -1,12 +0,0 @@ -class Test { - public void meth(byte pn) { - int vn1 = pn * pn; - int vn2 = pn / pn; - int vn3 = pn % pn; - int vn4 = pn + pn; - int vn5 = pn - pn; - int vn6 = pn << pn; - int vn7 = pn >> pn; - int vn8 = pn >>> pn; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t76/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t76/after/Test.items deleted file mode 100644 index 7a2163c3200b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t76/after/Test.items +++ /dev/null @@ -1,37 +0,0 @@ -Types: -PsiLocalVariable:vn1 : float -PsiLocalVariable:vn2 : float -PsiLocalVariable:vn3 : float -PsiLocalVariable:vn4 : float -PsiLocalVariable:vn5 : float -PsiLocalVariable:vn6 : float -PsiLocalVariable:vn7 : float -PsiLocalVariable:vn8 : float -PsiParameter:pn : float -PsiReferenceExpression:pn : float -PsiReferenceExpression:pn : float -PsiReferenceExpression:pn : float -PsiReferenceExpression:pn : float -PsiReferenceExpression:pn : float -PsiReferenceExpression:pn : float -PsiReferenceExpression:pn : float -PsiReferenceExpression:pn : float -PsiReferenceExpression:pn : float -PsiReferenceExpression:pn : float -PsiReferenceExpression:pn : float -PsiReferenceExpression:pn : float -PsiReferenceExpression:pn : float -PsiReferenceExpression:pn : float -PsiReferenceExpression:pn : float -PsiReferenceExpression:pn : float - -Conversions: - -New expression type changes: -Fails: -pn->float -pn->float -pn->float -pn->float -pn->float -pn->float diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t76/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t76/after/test.java deleted file mode 100644 index 3e6b69cf7c94..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t76/after/test.java +++ /dev/null @@ -1,12 +0,0 @@ -class Test { - public void meth(float pn) { - float vn1 = pn * pn; - float vn2 = pn / pn; - float vn3 = pn % pn; - float vn4 = pn + pn; - float vn5 = pn - pn; - float vn6 = pn << pn; - float vn7 = pn >> pn; - float vn8 = pn >>> pn; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t76/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t76/before/test.java deleted file mode 100644 index fdde94165b43..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t76/before/test.java +++ /dev/null @@ -1,12 +0,0 @@ -class Test { - public void meth(byte pn) { - int vn1 = pn * pn; - int vn2 = pn / pn; - int vn3 = pn % pn; - int vn4 = pn + pn; - int vn5 = pn - pn; - int vn6 = pn << pn; - int vn7 = pn >> pn; - int vn8 = pn >>> pn; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t77/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t77/after/Test.items deleted file mode 100644 index dc0f44202f9b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t77/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:pn : java.lang.Object -PsiReferenceExpression:pn : java.lang.Object - -Conversions: - -New expression type changes: -Fails: -pn->java.lang.Object diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t77/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t77/after/test.java deleted file mode 100644 index 4e8733a49d43..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t77/after/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - public void meth(Object pn, int p) { - p += pn; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t77/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t77/before/test.java deleted file mode 100644 index 252a45c4acc5..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t77/before/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - public void meth(int pn, int p) { - p += pn; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t78/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t78/after/Test.items deleted file mode 100644 index f935ec3be774..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t78/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiParameter:p : java.lang.String -PsiParameter:pn : java.lang.String -PsiReferenceExpression:p : java.lang.String -PsiReferenceExpression:pn : java.lang.String - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t78/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t78/after/test.java deleted file mode 100644 index 573deb573d11..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t78/after/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - public void meth(String pn, String p) { - p += pn; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t78/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t78/before/test.java deleted file mode 100644 index 252a45c4acc5..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t78/before/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - public void meth(int pn, int p) { - p += pn; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t79/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t79/after/Test.items deleted file mode 100644 index 9e7dba8b794e..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t79/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiParameter:p : byte -PsiReferenceExpression:p : byte - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t79/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t79/after/test.java deleted file mode 100644 index 37ec2cb0f5fd..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t79/after/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - public void meth(byte p) { - float f = (float)p; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t79/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t79/before/test.java deleted file mode 100644 index 30db2da5fa91..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t79/before/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - public void meth(int p) { - float f = (float)p; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t80/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t80/after/Test.items deleted file mode 100644 index 55661712f811..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t80/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiParameter:p : double -PsiReferenceExpression:p : double - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t80/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t80/after/test.java deleted file mode 100644 index 5fe4738b6a5e..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t80/after/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - public void meth(double p) { - float f = (float)p; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t80/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t80/before/test.java deleted file mode 100644 index 30db2da5fa91..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t80/before/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - public void meth(int p) { - float f = (float)p; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t81/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t81/after/Test.items deleted file mode 100644 index f89012c7c140..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t81/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiParameter:o : A -PsiReferenceExpression:o : A - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t81/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t81/after/test.java deleted file mode 100644 index 55deae9424fa..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t81/after/test.java +++ /dev/null @@ -1,9 +0,0 @@ -class A {} - -class B extends A {} - -class Test { - void foo(A o) { - if (o instanceof B){} - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t81/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t81/before/test.java deleted file mode 100644 index 8bccf86ced7b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t81/before/test.java +++ /dev/null @@ -1,9 +0,0 @@ -class A {} - -class B extends A {} - -class Test { - void foo(Object o) { - if (o instanceof B){} - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t82/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t82/after/Test.items deleted file mode 100644 index 5164a4b2f6d9..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t82/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:o : C -PsiReferenceExpression:o : C - -Conversions: - -New expression type changes: -Fails: -o->C diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t82/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t82/after/test.java deleted file mode 100644 index 83b747a3cb27..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t82/after/test.java +++ /dev/null @@ -1,11 +0,0 @@ -class C{} - -class A {} - -class B extends A {} - -class Test { - void foo(C o) { - if (o instanceof B){} - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t82/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t82/before/test.java deleted file mode 100644 index cb617f44766f..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t82/before/test.java +++ /dev/null @@ -1,11 +0,0 @@ -class C{} - -class A {} - -class B extends A {} - -class Test { - void foo(Object o) { - if (o instanceof B){} - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t83/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t83/after/Test.items deleted file mode 100644 index 9f0dab259a44..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t83/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiParameter:p : java.lang.Object -PsiReferenceExpression:p : java.lang.Object - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t83/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t83/after/test.java deleted file mode 100644 index 2a6715c81d3f..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t83/after/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - public void meth(Object p) { - float f = (float)p; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t83/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t83/before/test.java deleted file mode 100644 index 30db2da5fa91..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t83/before/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - public void meth(int p) { - float f = (float)p; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t84/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t84/after/Test.items deleted file mode 100644 index 5f64399bef41..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t84/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiLocalVariable:f : java.util.Set<? extends java.util.Set> -PsiParameter:p : java.util.Set<? extends java.util.Set> -PsiReferenceExpression:p : java.util.Set<? extends java.util.Set> - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t84/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t84/after/test.java deleted file mode 100644 index b055ef3a4df9..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t84/after/test.java +++ /dev/null @@ -1,6 +0,0 @@ -import java.util.*; -class Test { - public void meth(Set<? extends Set> p) { - Set<? extends Set> f = p; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t84/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t84/before/test.java deleted file mode 100644 index 7c85f93d7a57..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t84/before/test.java +++ /dev/null @@ -1,6 +0,0 @@ -import java.util.*; -class Test { - public void meth(Set p) { - Set<Set> f = p; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t85/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t85/after/Test.items deleted file mode 100644 index 76d7b14baa5d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t85/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiField:str : java.lang.Integer -PsiMethod:get : java.lang.Integer -PsiReferenceExpression:str : java.lang.Integer -PsiReferenceExpression:str : java.lang.Integer -PsiReferenceExpression:str : java.lang.Integer - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t85/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t85/after/test.java deleted file mode 100644 index c43a426e5277..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t85/after/test.java +++ /dev/null @@ -1,8 +0,0 @@ -public class Test { - - Integer str; - Integer get(boolean f) { - return f ? str : str + str; - } - -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t85/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t85/before/test.java deleted file mode 100644 index adde8623a884..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t85/before/test.java +++ /dev/null @@ -1,8 +0,0 @@ -public class Test { - - String str; - String get(boolean f) { - return f ? str : str + str; - } - -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t86/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t86/after/Test.items deleted file mode 100644 index c2f8f1dd9fa6..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t86/after/Test.items +++ /dev/null @@ -1,18 +0,0 @@ -Types: -PsiArrayAccessExpression:array[i] : java.lang.String -PsiArrayAccessExpression:array[i] : java.lang.String -PsiLocalVariable:array : java.util.List<java.lang.String> -PsiMethod:getArray : java.util.List<java.lang.String> -PsiMethodCallExpression:getArray() : java.util.List<java.lang.String> -PsiReferenceExpression:array : java.util.List<java.lang.String> -PsiReferenceExpression:array : java.util.List<java.lang.String> -PsiReferenceExpression:array : java.util.List<java.lang.String> -PsiReferenceExpression:array.length : int - -Conversions: -array.length -> $qualifier$.size() $qualifier$.length -array[i] -> $qualifier$.get($idx$) $qualifier$[$idx$] -array[i] -> $qualifier$.set($idx$, $expr$) $qualifier$[$idx$] = $expr$ array[i] = "" - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t86/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t86/after/test.java deleted file mode 100644 index 25f8b851603d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t86/after/test.java +++ /dev/null @@ -1,16 +0,0 @@ -import java.util.List; -public class Test { - - List<String> getArray(){ - return null; - } - - void foo() { - List<String> array = getArray(); - for (int i = 0; i < array.size(); i++) { - System.out.println(array.get(i)); - array.set(i, ""); - } - } - -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t86/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t86/before/test.java deleted file mode 100644 index 880c69463055..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t86/before/test.java +++ /dev/null @@ -1,16 +0,0 @@ -import java.util.List; -public class Test { - - String[] getArray(){ - return null; - } - - void foo() { - String[] array = getArray(); - for (int i = 0; i < array.length; i++) { - System.out.println(array[i]); - array[i] = ""; - } - } - -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t87/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t87/after/Test.items deleted file mode 100644 index 45193ce9dcf4..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t87/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiLocalVariable:array : java.lang.String[] -PsiMethod:getArray : java.lang.String[] -PsiMethodCallExpression:getArray() : java.lang.String[] -PsiReferenceExpression:array : java.lang.String[] - -Conversions: -array -> Arrays.sort($qualifier$) Collections.sort($qualifier$) Collections.sort(array) - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t87/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t87/after/test.java deleted file mode 100644 index f0e5159bfcfd..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t87/after/test.java +++ /dev/null @@ -1,13 +0,0 @@ -import java.util.*; -public class Test { - - String[] getArray(){ - return null; - } - - void foo() { - String[] array = getArray(); - Arrays.sort(array); - } - -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t87/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t87/before/test.java deleted file mode 100644 index 12a28fa3084c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t87/before/test.java +++ /dev/null @@ -1,13 +0,0 @@ -import java.util.*; -public class Test { - - List<String> getArray(){ - return null; - } - - void foo() { - List<String> array = getArray(); - Collections.sort(array); - } - -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t88/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t88/after/Test.items deleted file mode 100644 index 60ae50f9c699..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t88/after/Test.items +++ /dev/null @@ -1,15 +0,0 @@ -Types: -PsiLocalVariable:array : java.util.List<java.lang.String> -PsiMethod:getArray : java.util.List<java.lang.String> -PsiMethodCallExpression:getArray() : java.util.List<java.lang.String> -PsiReferenceExpression:array : java.util.List<java.lang.String> - -Conversions: -array -> Collections.sort($qualifier$, $expr$) Arrays.sort($qualifier$, $expr$) Arrays.sort(array, new Comparator<String>() { - public int compare(String s1, String s2) { - return 0; - } - }) - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t88/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t88/after/test.java deleted file mode 100644 index 4be724c5d907..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t88/after/test.java +++ /dev/null @@ -1,18 +0,0 @@ -import java.util.*; -public class Test { - - List<String> getArray(){ - return null; - } - - void foo() { - List<String> array = getArray(); - Collections.sort(array, new Comparator<String>() { - public int compare(String s1, String s2) { - return 0; - } - }); - - } - -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t88/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t88/before/test.java deleted file mode 100644 index ce19bd33f20e..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t88/before/test.java +++ /dev/null @@ -1,18 +0,0 @@ -import java.util.*; -public class Test { - - String[] getArray(){ - return null; - } - - void foo() { - String[] array = getArray(); - Arrays.sort(array, new Comparator<String>() { - public int compare(String s1, String s2) { - return 0; - } - }); - - } - -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t89/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t89/after/Test.items deleted file mode 100644 index 069dfb76e5c3..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t89/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiLocalVariable:array : java.lang.String[] -PsiMethod:getArray : java.lang.String[] -PsiMethodCallExpression:getArray() : java.lang.String[] -PsiReferenceExpression:array : java.lang.String[] - -Conversions: - -New expression type changes: -Fails: -array->java.lang.String[] diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t89/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t89/after/test.java deleted file mode 100644 index 5a625c53c286..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t89/after/test.java +++ /dev/null @@ -1,13 +0,0 @@ -import java.util.*; -public class Test { - - String[] getArray(){ - return null; - } - - void foo() { - String[] array = getArray(); - Collections.checkedList(array, String.class); - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t89/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t89/before/test.java deleted file mode 100644 index c12161d8c76d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t89/before/test.java +++ /dev/null @@ -1,13 +0,0 @@ -import java.util.*; -public class Test { - - List<String> getArray(){ - return null; - } - - void foo() { - List<String> array = getArray(); - Collections.checkedList(array, String.class); - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t90/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t90/after/Test.items deleted file mode 100644 index 721469c186fa..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t90/after/Test.items +++ /dev/null @@ -1,12 +0,0 @@ -Types: -PsiField:l : java.util.List<A> -PsiMethodCallExpression:b.foo() : java.util.Map<java.lang.String,java.lang.String> -PsiParameter:b : A -PsiReferenceExpression:b : A -PsiReferenceExpression:l : java.util.List<A> - -Conversions: -b.foo() -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t90/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t90/after/test.java deleted file mode 100644 index 06c072088b02..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t90/after/test.java +++ /dev/null @@ -1,24 +0,0 @@ -import java.util.*; -public class Test { - List<A> l; - - @Override - Map<String, String> foo() { - HashMap<String, String> m = new HashMap<String, String>(); - for (A b : l) { - Map<String, String> map = b.foo(); - for (Map.Entry<String, String> entry : map.entrySet()) { - if (!m.containsKey(entry.getKey())) { - m.put(entry.getKey(), entry.getValue()); - } - } - } - return m; - } -} - -class A { - Map<String, String> foo(){return null;} -} - -class B extends A {}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t90/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t90/before/test.java deleted file mode 100644 index 80afdc6aa08b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t90/before/test.java +++ /dev/null @@ -1,24 +0,0 @@ -import java.util.*; -public class Test { - List<B> l; - - @Override - Map<String, String> foo() { - HashMap<String, String> m = new HashMap<String, String>(); - for (B b : l) { - Map<String, String> map = b.foo(); - for (Map.Entry<String, String> entry : map.entrySet()) { - if (!m.containsKey(entry.getKey())) { - m.put(entry.getKey(), entry.getValue()); - } - } - } - return m; - } -} - -class A { - Map<String, String> foo(){return null;} -} - -class B extends A {}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t91/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t91/after/Test.items deleted file mode 100644 index 9b53aeaf2084..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t91/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiMethod:foo : java.lang.String[] - -Conversions: -"" -> new java.lang.String[]{$qualifier$} $qualifier$ "" - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t91/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t91/after/test.java deleted file mode 100644 index 9575d720b844..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t91/after/test.java +++ /dev/null @@ -1,5 +0,0 @@ -public class Test { - String[] foo(){ - return new String[]{""}; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t91/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t91/before/test.java deleted file mode 100644 index e916bd0a5dab..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t91/before/test.java +++ /dev/null @@ -1,5 +0,0 @@ -public class Test { - String foo(){ - return ""; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t92/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t92/after/Test.items deleted file mode 100644 index bf241c7966a7..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t92/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:f : java.util.List<java.lang.Integer> -PsiNewExpression:new ArrayList<String>(){} : java.util.ArrayList<java.lang.Integer> - -Conversions: - -New expression type changes: -new ArrayList<String>(){} -> java.util.ArrayList<java.lang.Integer> -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t92/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t92/after/test.java deleted file mode 100644 index f70bc9515dea..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t92/after/test.java +++ /dev/null @@ -1,4 +0,0 @@ -import java.util.*; -public class Test { - List<Integer> f = new ArrayList<Integer>(){}; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t92/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t92/before/test.java deleted file mode 100644 index 89ae1f7d3101..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t92/before/test.java +++ /dev/null @@ -1,4 +0,0 @@ -import java.util.*; -public class Test { - List<String> f = new ArrayList<String>(){}; -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t93/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t93/after/Test.items deleted file mode 100644 index ea2fc9440478..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t93/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiField:f : java.util.Map<java.lang.Boolean,java.lang.String> -PsiParameter:b : boolean -PsiReferenceExpression:b : boolean -PsiReferenceExpression:f : java.util.Map<java.lang.Boolean,java.lang.String> - -Conversions: -f -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t93/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t93/after/test.java deleted file mode 100644 index 6b714f8e8862..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t93/after/test.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.*; -public class Test { - Map<Boolean, String> f; - - void foo(boolean b) { - f.put(b, null); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t93/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t93/before/test.java deleted file mode 100644 index 292b5f9f0361..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t93/before/test.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.*; -public class Test { - Map<Boolean, String> f; - - void foo(Boolean b) { - f.put(b, null); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t94/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t94/after/Test.items deleted file mode 100644 index 76ae2a02000b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t94/after/Test.items +++ /dev/null @@ -1,13 +0,0 @@ -Types: -PsiLocalVariable:array : java.lang.String[] -PsiMethod:getArray : java.lang.String[] -PsiMethodCallExpression:getArray() : java.lang.String[] -PsiReferenceExpression:array : java.lang.String[] -PsiReferenceExpression:array : java.lang.String[] - -Conversions: -array -> Arrays.binarySearch($qualifier$, $key$) Collections.binarySearch($qualifier$, $key$) Collections.binarySearch(array, "") -array -> Arrays.sort($qualifier$) Collections.sort($qualifier$) Collections.sort(array) - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t94/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t94/after/test.java deleted file mode 100644 index d8df3e65dd43..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t94/after/test.java +++ /dev/null @@ -1,14 +0,0 @@ -import java.util.*; -public class Test { - - String[] getArray(){ - return null; - } - - void foo() { - String[] array = getArray(); - Arrays.binarySearch(array, ""); - Arrays.sort(array); - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t94/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t94/before/test.java deleted file mode 100644 index 99bf050d6f00..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t94/before/test.java +++ /dev/null @@ -1,14 +0,0 @@ -import java.util.*; -public class Test { - - List<String> getArray(){ - return null; - } - - void foo() { - List<String> array = getArray(); - Collections.binarySearch(array, ""); - Collections.sort(array); - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t95/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t95/after/Test.items deleted file mode 100644 index d3f8033938ea..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t95/after/Test.items +++ /dev/null @@ -1,13 +0,0 @@ -Types: -PsiLocalVariable:array : java.util.List<java.lang.String> -PsiMethod:getArray : java.util.List<java.lang.String> -PsiMethodCallExpression:getArray() : java.util.List<java.lang.String> -PsiReferenceExpression:array : java.util.List<java.lang.String> -PsiReferenceExpression:array : java.util.List<java.lang.String> - -Conversions: -array -> Collections.binarySearch($qualifier$, $key$) Arrays.binarySearch($qualifier$, $key$) Arrays.binarySearch(array, "") -array -> Collections.sort($qualifier$) Arrays.sort($qualifier$) Arrays.sort(array) - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t95/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t95/after/test.java deleted file mode 100644 index 99bf050d6f00..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t95/after/test.java +++ /dev/null @@ -1,14 +0,0 @@ -import java.util.*; -public class Test { - - List<String> getArray(){ - return null; - } - - void foo() { - List<String> array = getArray(); - Collections.binarySearch(array, ""); - Collections.sort(array); - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t95/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t95/before/test.java deleted file mode 100644 index d8df3e65dd43..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t95/before/test.java +++ /dev/null @@ -1,14 +0,0 @@ -import java.util.*; -public class Test { - - String[] getArray(){ - return null; - } - - void foo() { - String[] array = getArray(); - Arrays.binarySearch(array, ""); - Arrays.sort(array); - } - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t96/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t96/after/Test.items deleted file mode 100644 index d107b7626a41..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t96/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:f1 : java.lang.String -PsiField:f2 : java.lang.String -PsiReferenceExpression:f1 : java.lang.String - -Conversions: - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t96/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t96/after/test.java deleted file mode 100644 index 25357fd46118..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t96/after/test.java +++ /dev/null @@ -1,5 +0,0 @@ -public class Test { - String f1 = null; - String f2 = f1; - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t96/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t96/before/test.java deleted file mode 100644 index 55d7110ccb83..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t96/before/test.java +++ /dev/null @@ -1,5 +0,0 @@ -public class Test { - Integer f1 = null; - Integer f2 = f1; - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t97/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t97/after/Test.items deleted file mode 100644 index 1d376856a7ac..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t97/after/Test.items +++ /dev/null @@ -1,8 +0,0 @@ -Types: -PsiField:f1 : int - -Conversions: - -New expression type changes: -Fails: -{0}->int diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t97/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t97/after/test.java deleted file mode 100644 index 61687e78d725..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t97/after/test.java +++ /dev/null @@ -1,4 +0,0 @@ -public class Test { - int f1 = {0}; - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t97/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t97/before/test.java deleted file mode 100644 index f33899c2c3d7..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t97/before/test.java +++ /dev/null @@ -1,4 +0,0 @@ -public class Test { - Integer[] f1 = {0}; - -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t98/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t98/after/Test.items deleted file mode 100644 index 9b5e0b6b54e9..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t98/after/Test.items +++ /dev/null @@ -1,21 +0,0 @@ -Types: -PsiArrayAccessExpression:array[i] : java.lang.String -PsiArrayAccessExpression:array[i] : java.lang.String -PsiArrayAccessExpression:array[i] : java.lang.String -PsiLocalVariable:array : java.util.List<java.lang.String> -PsiMethod:getArray : java.util.List<java.lang.String> -PsiMethodCallExpression:getArray() : java.util.List<java.lang.String> -PsiReferenceExpression:array : java.util.List<java.lang.String> -PsiReferenceExpression:array : java.util.List<java.lang.String> -PsiReferenceExpression:array : java.util.List<java.lang.String> -PsiReferenceExpression:array : java.util.List<java.lang.String> -PsiReferenceExpression:array.length : int - -Conversions: -array.length -> $qualifier$.size() $qualifier$.length -array[i] -> $qualifier$.get($idx$) $qualifier$[$idx$] -array[i] -> $qualifier$.get($idx$) $qualifier$[$idx$] -array[i] -> $qualifier$.get($idx$) $qualifier$[$idx$] - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t98/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t98/after/test.java deleted file mode 100644 index 86e1e0b4f6c2..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t98/after/test.java +++ /dev/null @@ -1,17 +0,0 @@ -import java.util.List; -public class Test { - - List<String> getArray(){ - return null; - } - - void foo(String param) { - List<String> array = getArray(); - for (int i = 0; i < array.size(); i++) { - System.out.println(array.get(i)); - String str = array.get(i); - param = array.get(i); - } - } - -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t98/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t98/before/test.java deleted file mode 100644 index b79f9495d4ac..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t98/before/test.java +++ /dev/null @@ -1,17 +0,0 @@ -import java.util.List; -public class Test { - - String[] getArray(){ - return null; - } - - void foo(String param) { - String[] array = getArray(); - for (int i = 0; i < array.length; i++) { - System.out.println(array[i]); - String str = array[i]; - param = array[i]; - } - } - -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t99/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/t99/after/Test.items deleted file mode 100644 index 93ca5aa6a01e..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t99/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:f : java.util.Set<java.util.List<int[]>> -PsiNewExpression:new Set<List<char[]>>() : java.util.Set<java.util.List<int[]>> - -Conversions: - -New expression type changes: -new Set<List<char[]>>() -> java.util.Set<java.util.List<int[]>> -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t99/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t99/after/test.java deleted file mode 100644 index 1f7b49a490d9..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t99/after/test.java +++ /dev/null @@ -1,6 +0,0 @@ -import java.util.*; -public class Test { - Set<List<int[]>> f = new Set<>(); - - -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/t99/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/t99/before/test.java deleted file mode 100644 index 7ae6a2b492ba..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/t99/before/test.java +++ /dev/null @@ -1,6 +0,0 @@ -import java.util.*; -public class Test { - Set<List<char[]>> f = new Set<List<char[]>>(); - - -} diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/typeAnno/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigration/typeAnno/after/Test.items deleted file mode 100644 index ab263cc2b7a6..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/typeAnno/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:list : java.util.Collection<java.lang.Integer> -PsiNewExpression:new ArrayList<>(2) : java.util.ArrayList<java.lang.Integer> - -Conversions: - -New expression type changes: -new ArrayList<>(2) -> java.util.ArrayList<java.lang.Integer> -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/typeAnno/after/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/typeAnno/after/test.java deleted file mode 100644 index 7d25d562b91d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/typeAnno/after/test.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.lang.annotation.*; -import java.util.*; - -@Target(value = ElementType.TYPE_USE) -public @interface TA { } - -class Test { - Collection<@TA Integer> list = new ArrayList<>(2); -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigration/typeAnno/before/test.java b/plugins/typeMigration/testData/refactoring/typeMigration/typeAnno/before/test.java deleted file mode 100644 index 6cc51471d8d8..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigration/typeAnno/before/test.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.lang.annotation.*; -import java.util.*; - -@Target(value = ElementType.TYPE_USE) -public @interface TA { } - -class Test { - ArrayList<@TA Integer> list = new ArrayList<>(2); -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directAssignments/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directAssignments/after/Test.items deleted file mode 100644 index 9d1b1894378f..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directAssignments/after/Test.items +++ /dev/null @@ -1,25 +0,0 @@ -Types: -PsiAssignmentExpression:i += 2 : java.util.concurrent.atomic.AtomicInteger -PsiAssignmentExpression:i -= 5 : java.util.concurrent.atomic.AtomicInteger -PsiBinaryExpression:i + 9 : int -PsiBinaryExpression:i - 9 : int -PsiBinaryExpression:i == 0 : boolean -PsiField:i : java.util.concurrent.atomic.AtomicInteger -PsiReferenceExpression:i : java.util.concurrent.atomic.AtomicInteger -PsiReferenceExpression:i : java.util.concurrent.atomic.AtomicInteger -PsiReferenceExpression:i : java.util.concurrent.atomic.AtomicInteger -PsiReferenceExpression:i : java.util.concurrent.atomic.AtomicInteger -PsiReferenceExpression:i : java.util.concurrent.atomic.AtomicInteger -PsiReferenceExpression:i : java.util.concurrent.atomic.AtomicInteger - -Conversions: -0 -> new java.util.concurrent.atomic.AtomicInteger($val$) $val$ -9 -> $qualifier$.set($val$) $qualifier$ = $val$ i = 9 -i + 9 -> $qualifier$.get() + $val$ $qualifier$+$val$ -i += 2 -> $qualifier$.getAndAdd(($val$)) $qualifier$ += $val$ -i - 9 -> $qualifier$.get() - $val$ $qualifier$-$val$ -i -= 5 -> $qualifier$.getAndAdd(-($val$)) $qualifier$ -= $val$ -i == 0 -> $qualifier$.get() == $val$ $qualifier$==$val$ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directAssignments/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directAssignments/after/Test.java deleted file mode 100644 index 5c16607a8b70..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directAssignments/after/Test.java +++ /dev/null @@ -1,16 +0,0 @@ -import java.util.concurrent.atomic.AtomicInteger; - -class Test { - AtomicInteger i = new AtomicInteger(0); - - void foo() { - i.getAndAdd((2)); - i.getAndAdd(-(5)); - if (i.get() == 0) { - i.set(9); - } - - System.out.println(i.get() + 9); - System.out.println(i.get() - 9); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directAssignments/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directAssignments/before/Test.java deleted file mode 100644 index b96f02057dfd..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directAssignments/before/Test.java +++ /dev/null @@ -1,14 +0,0 @@ -class Test { - int i = 0; - - void foo() { - i += 2; - i -= 5; - if (i == 0) { - i = 9; - } - - System.out.println(i + 9); - System.out.println(i - 9); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directByte/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directByte/after/Test.items deleted file mode 100644 index e0e121ecf00d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directByte/after/Test.items +++ /dev/null @@ -1,19 +0,0 @@ -Types: -PsiAssignmentExpression:b += 0 : java.util.concurrent.atomic.AtomicReference<java.lang.Byte> -PsiBinaryExpression:b == 0 : boolean -PsiField:b : java.util.concurrent.atomic.AtomicReference<java.lang.Byte> -PsiPostfixExpression:b++ : java.util.concurrent.atomic.AtomicReference<java.lang.Byte> -PsiReferenceExpression:b : java.util.concurrent.atomic.AtomicReference<java.lang.Byte> -PsiReferenceExpression:b : java.util.concurrent.atomic.AtomicReference<java.lang.Byte> -PsiReferenceExpression:b : java.util.concurrent.atomic.AtomicReference<java.lang.Byte> -PsiReferenceExpression:b : java.util.concurrent.atomic.AtomicReference<java.lang.Byte> - -Conversions: -0 -> new java.util.concurrent.atomic.AtomicReference<java.lang.Byte>((byte)$val$) $val$ -b += 0 -> $qualifier$.set(new Byte((byte)($qualifier$.get() + $val$))) $qualifier$+=$val$ -b -> $qualifier$.get() $qualifier$ b -b == 0 -> $qualifier$.get() == $val$ $qualifier$==$val$ -b++ -> $qualifier$.getAndSet(new Byte((byte)($qualifier$.get() + 1))) $qualifier$++ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directByte/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directByte/after/Test.java deleted file mode 100644 index a1dbfc714326..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directByte/after/Test.java +++ /dev/null @@ -1,14 +0,0 @@ -import java.util.concurrent.atomic.AtomicReference; - -class Test { - AtomicReference<Byte> b = new AtomicReference<Byte>((byte) 0); - - void bar() { - if (b.get() == 0) { - b.getAndSet(new Byte((byte) (b.get() + 1))); - b.set(new Byte((byte) (b.get() + 0))); - //System.out.println(b + 10); - System.out.println(b.get()); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directByte/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directByte/before/Test.java deleted file mode 100644 index fa494c28a3c4..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directByte/before/Test.java +++ /dev/null @@ -1,12 +0,0 @@ -class Test { - byte b = 0; - - void bar() { - if (b == 0) { - b++; - b += 0; - //System.out.println(b + 10); - System.out.println(b); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directConditions/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directConditions/after/Test.items deleted file mode 100644 index 95f366691485..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directConditions/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiField:b : java.util.concurrent.atomic.AtomicBoolean -PsiReferenceExpression:b : java.util.concurrent.atomic.AtomicBoolean -PsiReferenceExpression:b : java.util.concurrent.atomic.AtomicBoolean - -Conversions: -b -> $qualifier$.get() $qualifier$ b -true -> $qualifier$.set($val$) $qualifier$ = $val$ b = true - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directConditions/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directConditions/after/Test.java deleted file mode 100644 index 02fc40276a86..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directConditions/after/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -import java.util.concurrent.atomic.AtomicBoolean; - -class Test { - AtomicBoolean b; - - void foo() { - if (b.get()) { - b.set(true); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directConditions/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directConditions/before/Test.java deleted file mode 100644 index ef5413600c40..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directConditions/before/Test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - boolean b; - - void foo() { - if (b) { - b = true; - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directForeach/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directForeach/after/Test.items deleted file mode 100644 index add3ea1f98e3..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directForeach/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiField:lst : java.util.concurrent.atomic.AtomicReference<java.util.List<java.lang.String>> -PsiReferenceExpression:lst : java.util.concurrent.atomic.AtomicReference<java.util.List<java.lang.String>> - -Conversions: -lst -> $qualifier$.get() $qualifier$ lst - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directForeach/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directForeach/after/Test.java deleted file mode 100644 index 4db9a5619849..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directForeach/after/Test.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.*; -import java.util.concurrent.atomic.AtomicReference; - -class Test { - AtomicReference<List<String>> lst; - - void foo() { - for (String s : lst.get()) { - System.out.println(s); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directForeach/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directForeach/before/Test.java deleted file mode 100644 index 1d40f4082444..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directForeach/before/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -import java.util.*; - -class Test { - List<String> lst; - - void foo() { - for (String s : lst) { - System.out.println(s); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directIncrementDecrement/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directIncrementDecrement/after/Test.items deleted file mode 100644 index 852aa470a285..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directIncrementDecrement/after/Test.items +++ /dev/null @@ -1,25 +0,0 @@ -Types: -PsiField:i : java.util.concurrent.atomic.AtomicInteger -PsiPostfixExpression:i++ : java.util.concurrent.atomic.AtomicInteger -PsiPostfixExpression:i++ : java.util.concurrent.atomic.AtomicInteger -PsiPostfixExpression:i-- : java.util.concurrent.atomic.AtomicInteger -PsiPrefixExpression:++i : java.util.concurrent.atomic.AtomicInteger -PsiPrefixExpression:--i : java.util.concurrent.atomic.AtomicInteger -PsiPrefixExpression:--i : java.util.concurrent.atomic.AtomicInteger -PsiReferenceExpression:i : java.util.concurrent.atomic.AtomicInteger -PsiReferenceExpression:i : java.util.concurrent.atomic.AtomicInteger -PsiReferenceExpression:i : java.util.concurrent.atomic.AtomicInteger -PsiReferenceExpression:i : java.util.concurrent.atomic.AtomicInteger -PsiReferenceExpression:i : java.util.concurrent.atomic.AtomicInteger -PsiReferenceExpression:i : java.util.concurrent.atomic.AtomicInteger - -Conversions: -++i -> $qualifier$.incrementAndGet() ++$qualifier$ ---i -> $qualifier$.decrementAndGet() --$qualifier$ ---i -> $qualifier$.decrementAndGet() --$qualifier$ -i++ -> $qualifier$.getAndIncrement() $qualifier$++ -i++ -> $qualifier$.getAndIncrement() $qualifier$++ -i-- -> $qualifier$.getAndDecrement() $qualifier$-- - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directIncrementDecrement/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directIncrementDecrement/after/Test.java deleted file mode 100644 index bdcf7171016b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directIncrementDecrement/after/Test.java +++ /dev/null @@ -1,14 +0,0 @@ -import java.util.concurrent.atomic.AtomicInteger; - -class Test { - AtomicInteger i; - - void foo() { - i.getAndIncrement(); - i.incrementAndGet(); - i.getAndDecrement(); - i.decrementAndGet(); - System.out.println(i.getAndIncrement()); - System.out.println(i.decrementAndGet()); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directIncrementDecrement/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directIncrementDecrement/before/Test.java deleted file mode 100644 index be6aa55d5f29..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directIncrementDecrement/before/Test.java +++ /dev/null @@ -1,12 +0,0 @@ -class Test { - int i; - - void foo() { - i++; - ++i; - i--; - --i; - System.out.println(i++); - System.out.println(--i); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directIntArray/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directIntArray/after/Test.items deleted file mode 100644 index 69a66c34a6cb..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directIntArray/after/Test.items +++ /dev/null @@ -1,34 +0,0 @@ -Types: -PsiArrayAccessExpression:a[0] : int -PsiArrayAccessExpression:a[0] : int -PsiArrayAccessExpression:a[0] : int -PsiArrayAccessExpression:a[0] : int -PsiArrayAccessExpression:a[0] : int -PsiArrayAccessExpression:a[0] : int -PsiArrayAccessExpression:a[0] : int -PsiArrayAccessExpression:a[0] : int -PsiField:a : java.util.concurrent.atomic.AtomicIntegerArray -PsiReferenceExpression:a : java.util.concurrent.atomic.AtomicIntegerArray -PsiReferenceExpression:a : java.util.concurrent.atomic.AtomicIntegerArray -PsiReferenceExpression:a : java.util.concurrent.atomic.AtomicIntegerArray -PsiReferenceExpression:a : java.util.concurrent.atomic.AtomicIntegerArray -PsiReferenceExpression:a : java.util.concurrent.atomic.AtomicIntegerArray -PsiReferenceExpression:a : java.util.concurrent.atomic.AtomicIntegerArray -PsiReferenceExpression:a : java.util.concurrent.atomic.AtomicIntegerArray -PsiReferenceExpression:a : java.util.concurrent.atomic.AtomicIntegerArray -PsiReferenceExpression:a : java.util.concurrent.atomic.AtomicIntegerArray - -Conversions: -a[0] -> $qualifier$.decrementAndGet($idx$) --$qualifier$[$idx$] --a[0] -a[0] -> $qualifier$.get($idx$) $qualifier$[$idx$] a[0] -a[0] -> $qualifier$.get($idx$) $qualifier$[$idx$] a[0] -a[0] -> $qualifier$.getAndAdd($idx$, ($val$)) $qualifier$[$idx$] += $val$ a[0] += (2) -a[0] -> $qualifier$.getAndDecrement($idx$) $qualifier$[$idx$]-- a[0]-- -a[0] -> $qualifier$.getAndIncrement($idx$) $qualifier$[$idx$]++ a[0]++ -a[0] -> $qualifier$.incrementAndGet($idx$) ++$qualifier$[$idx$] ++a[0] -a[0] -> $qualifier$.set($idx$, $qualifier$.get($idx$) * $val$) $qualifier$[$idx$]*=$val$ a[0] *= 2 -new int[0] -> new java.util.concurrent.atomic.AtomicIntegerArray($val$) $val$ new int[0] -new int[1] -> new java.util.concurrent.atomic.AtomicIntegerArray($val$) $val$ new int[1] - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directIntArray/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directIntArray/after/Test.java deleted file mode 100644 index 8dbba12048fe..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directIntArray/after/Test.java +++ /dev/null @@ -1,20 +0,0 @@ -import java.util.concurrent.atomic.AtomicIntegerArray; - -class Test { - AtomicIntegerArray a = new AtomicIntegerArray(new int[1]); - - - void foo() { - a.getAndIncrement(0); - System.out.println(a.incrementAndGet(0)); - a.getAndDecrement(0); - if (a.decrementAndGet(0) == 0) { - a.getAndAdd(0, ((2))); - a.set(0, a.get(0) * 2); - if (a.get(0) == 0) { - System.out.println(a.get(0) + 7); - } - } - a = new AtomicIntegerArray(new int[0]); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directIntArray/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directIntArray/before/Test.java deleted file mode 100644 index 5d39cf2963c6..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directIntArray/before/Test.java +++ /dev/null @@ -1,18 +0,0 @@ -class Test { - int[] a = new int[1]; - - - void foo() { - a[0]++; - System.out.println(++a[0]); - a[0]--; - if (--a[0] == 0) { - a[0] += (2); - a[0] *= 2; - if (a[0] == 0) { - System.out.println(a[0] + 7); - } - } - a = new int[0]; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directString/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directString/after/Test.items deleted file mode 100644 index 0d306b0b4747..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directString/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiField:s : java.util.concurrent.atomic.AtomicReference<java.lang.String> -PsiReferenceExpression:s : java.util.concurrent.atomic.AtomicReference<java.lang.String> -PsiReferenceExpression:s : java.util.concurrent.atomic.AtomicReference<java.lang.String> - -Conversions: -"" -> new java.util.concurrent.atomic.AtomicReference<java.lang.String>($val$) $val$ -s -> $qualifier$.get() $qualifier$ s - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directString/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directString/after/Test.java deleted file mode 100644 index cb32e0ba130b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directString/after/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -import java.util.concurrent.atomic.AtomicReference; - -class Test { - AtomicReference<String> s = new AtomicReference<String>(""); - - void foo() { - if (s == null) { - System.out.println(s.get()); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directString/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directString/before/Test.java deleted file mode 100644 index 1770416a0295..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directString/before/Test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - String s = ""; - - void foo() { - if (s == null) { - System.out.println(s); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directStringArray/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directStringArray/after/Test.items deleted file mode 100644 index b90b4a347f40..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directStringArray/after/Test.items +++ /dev/null @@ -1,14 +0,0 @@ -Types: -PsiArrayAccessExpression:s[0] : java.lang.String -PsiArrayAccessExpression:s[0] : java.lang.String -PsiField:s : java.util.concurrent.atomic.AtomicReferenceArray<java.lang.String> -PsiReferenceExpression:s : java.util.concurrent.atomic.AtomicReferenceArray<java.lang.String> -PsiReferenceExpression:s : java.util.concurrent.atomic.AtomicReferenceArray<java.lang.String> - -Conversions: -new String[2] -> new java.util.concurrent.atomic.AtomicReferenceArray<java.lang.String>($val$) $val$ new String[2] -s[0] -> $qualifier$.get($idx$) $qualifier$[$idx$] s[0] -s[0] -> $qualifier$.set($idx$, $val$) $qualifier$[$idx$] = $val$ s[0] = "" - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directStringArray/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directStringArray/after/Test.java deleted file mode 100644 index 42415d0c3141..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directStringArray/after/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -import java.util.concurrent.atomic.AtomicReferenceArray; - -class Test { - AtomicReferenceArray<String> s = new AtomicReferenceArray<String>(new String[2]); - - void foo() { - s.set(0, ""); - System.out.println(s.get(0)); - - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directStringArray/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directStringArray/before/Test.java deleted file mode 100644 index 4f19feba6479..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/directStringArray/before/Test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - String[] s = new String[2]; - - void foo() { - s[0] = ""; - System.out.println(s[0]); - - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseAssignments/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseAssignments/after/Test.items deleted file mode 100644 index 767993764c48..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseAssignments/after/Test.items +++ /dev/null @@ -1,26 +0,0 @@ -Types: -PsiField:i : int -PsiMethodCallExpression:i.addAndGet(-(9)) : int -PsiMethodCallExpression:i.addAndGet(9) : int -PsiMethodCallExpression:i.get() : int -PsiMethodCallExpression:i.getAndAdd(-5) : int -PsiMethodCallExpression:i.getAndAdd(2) : int -PsiMethodCallExpression:i.set(9) : void -PsiReferenceExpression:i : int -PsiReferenceExpression:i : int -PsiReferenceExpression:i : int -PsiReferenceExpression:i : int -PsiReferenceExpression:i : int -PsiReferenceExpression:i : int - -Conversions: -i.addAndGet(-(9)) -> $qualifier$ + $delta$ $qualifier$.addAndGet($delta$) -i.addAndGet(9) -> $qualifier$ + $delta$ $qualifier$.addAndGet($delta$) -i.get() -> $qualifier$ $qualifier$.get() -i.getAndAdd(-5) -> $qualifier$ += $val$ $qualifier$.getAndAdd($val$) -i.getAndAdd(2) -> $qualifier$ += $val$ $qualifier$.getAndAdd($val$) -i.set(9) -> $qualifier$ = $val$ $qualifier$.set($val$) -new AtomicInteger(0) -> $qualifier$ new $type$($qualifier$) - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseAssignments/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseAssignments/after/Test.java deleted file mode 100644 index 1372ccee2b27..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseAssignments/after/Test.java +++ /dev/null @@ -1,15 +0,0 @@ -import java.util.concurrent.atomic.AtomicInteger; -class Test { - int i = 0; - - void foo() { - i += 2; - i += -5; - if (i == 0) { - i = 9; - } - - System.out.println(i + 9); - System.out.println(i + -(9)); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseAssignments/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseAssignments/before/Test.java deleted file mode 100644 index cfd312daa073..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseAssignments/before/Test.java +++ /dev/null @@ -1,15 +0,0 @@ -import java.util.concurrent.atomic.AtomicInteger; -class Test { - AtomicInteger i = new AtomicInteger(0); - - void foo() { - i.getAndAdd(2); - i.getAndAdd(-5); - if (i.get() == 0) { - i.set(9); - } - - System.out.println(i.addAndGet(9)); - System.out.println(i.addAndGet(-(9))); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseByte/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseByte/after/Test.items deleted file mode 100644 index 8585bda9e020..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseByte/after/Test.items +++ /dev/null @@ -1,26 +0,0 @@ -Types: -PsiField:b : byte -PsiMethodCallExpression:b.get() : java.lang.Byte -PsiMethodCallExpression:b.get() : java.lang.Byte -PsiMethodCallExpression:b.get() : java.lang.Byte -PsiMethodCallExpression:b.get() : java.lang.Byte -PsiMethodCallExpression:b.getAndSet(new Byte((byte) (b.get() + 1))) : java.lang.Byte -PsiMethodCallExpression:b.set(new Byte((byte) (b.get() + 0))) : void -PsiReferenceExpression:b : byte -PsiReferenceExpression:b : byte -PsiReferenceExpression:b : byte -PsiReferenceExpression:b : byte -PsiReferenceExpression:b : byte -PsiReferenceExpression:b : byte - -Conversions: -b.get() -> $qualifier$ $qualifier$.get() -b.get() -> $qualifier$ $qualifier$.get() -b.get() -> $qualifier$ $qualifier$.get() -b.get() -> $qualifier$ $qualifier$.get() -b.getAndSet(new Byte((byte) (b.get() + 1))) -> $qualifier$ = $val$ $qualifier$.getAndSet($val$) -b.set(new Byte((byte) (b.get() + 0))) -> $qualifier$ = $val$ $qualifier$.set($val$) -new AtomicReference<Byte>((byte) 0) -> $qualifier$ new $type$($qualifier$) - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseByte/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseByte/after/Test.java deleted file mode 100644 index 28445dd31728..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseByte/after/Test.java +++ /dev/null @@ -1,14 +0,0 @@ -import java.util.concurrent.atomic.AtomicReference; - -class Test { - byte b = (byte) 0; - - void bar() { - if (b == 0) { - b = new Byte((byte) (b + 1)); - b = new Byte((byte) (b + 0)); - //System.out.println(b + 10); - System.out.println(b); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseByte/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseByte/before/Test.java deleted file mode 100644 index a1dbfc714326..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseByte/before/Test.java +++ /dev/null @@ -1,14 +0,0 @@ -import java.util.concurrent.atomic.AtomicReference; - -class Test { - AtomicReference<Byte> b = new AtomicReference<Byte>((byte) 0); - - void bar() { - if (b.get() == 0) { - b.getAndSet(new Byte((byte) (b.get() + 1))); - b.set(new Byte((byte) (b.get() + 0))); - //System.out.println(b + 10); - System.out.println(b.get()); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseConditions/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseConditions/after/Test.items deleted file mode 100644 index 3594508bebe5..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseConditions/after/Test.items +++ /dev/null @@ -1,13 +0,0 @@ -Types: -PsiField:b : boolean -PsiMethodCallExpression:b.get() : boolean -PsiMethodCallExpression:b.set(true) : void -PsiReferenceExpression:b : boolean -PsiReferenceExpression:b : boolean - -Conversions: -b.get() -> $qualifier$ $qualifier$.get() -b.set(true) -> $qualifier$ = $val$ $qualifier$.set($val$) - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseConditions/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseConditions/after/Test.java deleted file mode 100644 index 92f515c35936..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseConditions/after/Test.java +++ /dev/null @@ -1,10 +0,0 @@ -import java.util.concurrent.atomic.AtomicBoolean; -class Test { - boolean b; - - void foo() { - if (b) { - b = true; - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseConditions/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseConditions/before/Test.java deleted file mode 100644 index 5464f705ddeb..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseConditions/before/Test.java +++ /dev/null @@ -1,10 +0,0 @@ -import java.util.concurrent.atomic.AtomicBoolean; -class Test { - AtomicBoolean b; - - void foo() { - if (b.get()) { - b.set(true); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIncrementDecrement/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIncrementDecrement/after/Test.items deleted file mode 100644 index cba5bc10f359..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIncrementDecrement/after/Test.items +++ /dev/null @@ -1,25 +0,0 @@ -Types: -PsiField:i : int -PsiMethodCallExpression:i.decrementAndGet() : int -PsiMethodCallExpression:i.decrementAndGet() : int -PsiMethodCallExpression:i.getAndDecrement() : int -PsiMethodCallExpression:i.getAndIncrement() : int -PsiMethodCallExpression:i.getAndIncrement() : int -PsiMethodCallExpression:i.incrementAndGet() : int -PsiReferenceExpression:i : int -PsiReferenceExpression:i : int -PsiReferenceExpression:i : int -PsiReferenceExpression:i : int -PsiReferenceExpression:i : int -PsiReferenceExpression:i : int - -Conversions: -i.decrementAndGet() -> --$qualifier$ $qualifier$.decrementAndGet() -i.decrementAndGet() -> --$qualifier$ $qualifier$.decrementAndGet() -i.getAndDecrement() -> $qualifier$-- $qualifier$.getAndDecrement() -i.getAndIncrement() -> $qualifier$++ $qualifier$.getAndIncrement() -i.getAndIncrement() -> $qualifier$++ $qualifier$.getAndIncrement() -i.incrementAndGet() -> ++$qualifier$ $qualifier$.incrementAndGet() - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIncrementDecrement/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIncrementDecrement/after/Test.java deleted file mode 100644 index dd70e550a751..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIncrementDecrement/after/Test.java +++ /dev/null @@ -1,13 +0,0 @@ -import java.util.concurrent.atomic.AtomicInteger; -class Test { - int i; - - void foo() { - i++; - ++i; - i--; - --i; - System.out.println(i++); - System.out.println(--i); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIncrementDecrement/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIncrementDecrement/before/Test.java deleted file mode 100644 index 853e5387aca9..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIncrementDecrement/before/Test.java +++ /dev/null @@ -1,13 +0,0 @@ -import java.util.concurrent.atomic.AtomicInteger; -class Test { - AtomicInteger i; - - void foo() { - i.getAndIncrement(); - i.incrementAndGet(); - i.getAndDecrement(); - i.decrementAndGet(); - System.out.println(i.getAndIncrement()); - System.out.println(i.decrementAndGet()); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIntArray/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIntArray/after/Test.items deleted file mode 100644 index 55c1c7bc2574..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIntArray/after/Test.items +++ /dev/null @@ -1,35 +0,0 @@ -Types: -PsiField:a : int[] -PsiMethodCallExpression:a.addAndGet(0, 7) : int -PsiMethodCallExpression:a.decrementAndGet(0) : int -PsiMethodCallExpression:a.get(0) : int -PsiMethodCallExpression:a.get(0) : int -PsiMethodCallExpression:a.getAndAdd(0, ((2))) : int -PsiMethodCallExpression:a.getAndDecrement(0) : int -PsiMethodCallExpression:a.getAndIncrement(0) : int -PsiMethodCallExpression:a.incrementAndGet(0) : int -PsiMethodCallExpression:a.set(0, a.get(0) * 2) : void -PsiReferenceExpression:a : int[] -PsiReferenceExpression:a : int[] -PsiReferenceExpression:a : int[] -PsiReferenceExpression:a : int[] -PsiReferenceExpression:a : int[] -PsiReferenceExpression:a : int[] -PsiReferenceExpression:a : int[] -PsiReferenceExpression:a : int[] -PsiReferenceExpression:a : int[] - -Conversions: -a.addAndGet(0, 7) -> $qualifier$[$idx$] + $delta$ $qualifier$.addAndGet($idx$, $delta$) -a.decrementAndGet(0) -> --$qualifier$[$idx$] $qualifier$.decrementAndGet($idx$) -a.get(0) -> $qualifier$[$idx$] $qualifier$.get($idx$) -a.get(0) -> $qualifier$[$idx$] $qualifier$.get($idx$) -a.getAndAdd(0, ((2))) -> $qualifier$[$idx$] += $val$ $qualifier$.getAndAdd($idx$, $val$) -a.getAndDecrement(0) -> $qualifier$[$idx$]-- $qualifier$.getAndDecrement($idx$) -a.getAndIncrement(0) -> $qualifier$[$idx$]++ $qualifier$.getAndIncrement($idx$) -a.incrementAndGet(0) -> ++$qualifier$[$idx$] $qualifier$.incrementAndGet($idx$) -a.set(0, a.get(0) * 2) -> $qualifier$[$idx$] = $val$ $qualifier$.set($idx$, $val$) -new AtomicIntegerArray(new int[1]) -> $qualifier$ new $type$($qualifier$) - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIntArray/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIntArray/after/Test.java deleted file mode 100644 index 401714230d3c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIntArray/after/Test.java +++ /dev/null @@ -1,19 +0,0 @@ -import java.util.concurrent.atomic.AtomicIntegerArray; - -class Test { - int[] a = new int[1]; - - - void foo() { - a[0]++; - System.out.println(++a[0]); - a[0]--; - if (--a[0] == 0) { - a[0] += ((2)); - a[0] = a[0] * 2; - if (a[0] == 0) { - System.out.println(a[0] + 7); - } - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIntArray/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIntArray/before/Test.java deleted file mode 100644 index df31528b9d7e..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIntArray/before/Test.java +++ /dev/null @@ -1,19 +0,0 @@ -import java.util.concurrent.atomic.AtomicIntegerArray; - -class Test { - AtomicIntegerArray a = new AtomicIntegerArray(new int[1]); - - - void foo() { - a.getAndIncrement(0); - System.out.println(a.incrementAndGet(0)); - a.getAndDecrement(0); - if (a.decrementAndGet(0) == 0) { - a.getAndAdd(0, ((2))); - a.set(0, a.get(0) * 2); - if (a.get(0) == 0) { - System.out.println(a.addAndGet(0, 7)); - } - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseString/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseString/after/Test.items deleted file mode 100644 index 7c23d49d8bfd..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseString/after/Test.items +++ /dev/null @@ -1,12 +0,0 @@ -Types: -PsiField:s : java.lang.String -PsiMethodCallExpression:s.get() : java.lang.String -PsiReferenceExpression:s : java.lang.String -PsiReferenceExpression:s : java.lang.String - -Conversions: -new AtomicReference<String>("") -> $qualifier$ new $type$($qualifier$) -s.get() -> $qualifier$ $qualifier$.get() - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseString/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseString/after/Test.java deleted file mode 100644 index a0106ff8d66f..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseString/after/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -import java.util.concurrent.atomic.AtomicReference; - -class Test { - String s = ""; - - void foo() { - if (s == null) { - System.out.println(s); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseString/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseString/before/Test.java deleted file mode 100644 index cb32e0ba130b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseString/before/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -import java.util.concurrent.atomic.AtomicReference; - -class Test { - AtomicReference<String> s = new AtomicReference<String>(""); - - void foo() { - if (s == null) { - System.out.println(s.get()); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseStringArray/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseStringArray/after/Test.items deleted file mode 100644 index eaf82b5cc2e6..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseStringArray/after/Test.items +++ /dev/null @@ -1,14 +0,0 @@ -Types: -PsiField:s : java.lang.String[] -PsiMethodCallExpression:s.get(0) : java.lang.String -PsiMethodCallExpression:s.set(0, "") : void -PsiReferenceExpression:s : java.lang.String[] -PsiReferenceExpression:s : java.lang.String[] - -Conversions: -new AtomicReferenceArray<String>(new String[2]) -> $qualifier$ new $type$($qualifier$) -s.get(0) -> $qualifier$[$idx$] $qualifier$.get($idx$) -s.set(0, "") -> $qualifier$[$idx$] = $val$ $qualifier$.set($idx$, $val$) - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseStringArray/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseStringArray/after/Test.java deleted file mode 100644 index 0c64ea445f01..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseStringArray/after/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -import java.util.concurrent.atomic.AtomicReferenceArray; - -class Test { - String[] s = new String[2]; - - void foo() { - s[0] = ""; - System.out.println(s[0]); - - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseStringArray/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseStringArray/before/Test.java deleted file mode 100644 index fbc97bc2eb36..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseStringArray/before/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -import java.util.concurrent.atomic.AtomicReferenceArray; - -class Test { - AtomicReferenceArray<String> s = new AtomicReferenceArray<String>(new String[2]); - - void foo() { - s.set(0, ""); - System.out.println(s.get(0)); - - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directByte/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directByte/after/Test.items deleted file mode 100644 index e01b4b5e1f8b..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directByte/after/Test.items +++ /dev/null @@ -1,22 +0,0 @@ -Types: -PsiBinaryExpression:i == 0 : boolean -PsiField:i : java.lang.ThreadLocal<java.lang.Byte> -PsiPostfixExpression:i++ : java.lang.ThreadLocal<java.lang.Byte> -PsiPostfixExpression:i-- : java.lang.ThreadLocal<java.lang.Byte> -PsiPrefixExpression:++i : java.lang.ThreadLocal<java.lang.Byte> -PsiPrefixExpression:--i : java.lang.ThreadLocal<java.lang.Byte> -PsiReferenceExpression:i : java.lang.ThreadLocal<java.lang.Byte> -PsiReferenceExpression:i : java.lang.ThreadLocal<java.lang.Byte> -PsiReferenceExpression:i : java.lang.ThreadLocal<java.lang.Byte> -PsiReferenceExpression:i : java.lang.ThreadLocal<java.lang.Byte> -PsiReferenceExpression:i : java.lang.ThreadLocal<java.lang.Byte> - -Conversions: -++i -> $qualifier$.set(new java.lang.Byte((byte)($qualifier$.get() + 1))) ++$qualifier$ ---i -> $qualifier$.set(new java.lang.Byte((byte)($qualifier$.get() - 1))) --$qualifier$ -i == 0 -> $qualifier$.get() == $val$ $qualifier$==$val$ -i++ -> $qualifier$.set(new java.lang.Byte((byte)($qualifier$.get() + 1))) $qualifier$++ -i-- -> $qualifier$.set(new java.lang.Byte((byte)($qualifier$.get() - 1))) $qualifier$-- - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directByte/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directByte/after/Test.java deleted file mode 100644 index 61b88dbefceb..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directByte/after/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -class Test { - ThreadLocal<Byte> i; - - void foo() { - i.set(new Byte((byte) (i.get() + 1))); - i.set(new Byte((byte) (i.get() + 1))); - i.set(new Byte((byte) (i.get() - 1))); - i.set(new Byte((byte) (i.get() - 1))); - if (i.get() == 0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directByte/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directByte/before/Test.java deleted file mode 100644 index dd3fb1bca60d..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directByte/before/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -class Test { - byte i; - - void foo() { - i++; - ++i; - i--; - --i; - if (i == 0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directInt/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directInt/after/Test.items deleted file mode 100644 index 1bffd7037cb6..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directInt/after/Test.items +++ /dev/null @@ -1,22 +0,0 @@ -Types: -PsiBinaryExpression:i == 0 : boolean -PsiField:i : java.lang.ThreadLocal<java.lang.Integer> -PsiPostfixExpression:i++ : java.lang.ThreadLocal<java.lang.Integer> -PsiPostfixExpression:i-- : java.lang.ThreadLocal<java.lang.Integer> -PsiPrefixExpression:++i : java.lang.ThreadLocal<java.lang.Integer> -PsiPrefixExpression:--i : java.lang.ThreadLocal<java.lang.Integer> -PsiReferenceExpression:i : java.lang.ThreadLocal<java.lang.Integer> -PsiReferenceExpression:i : java.lang.ThreadLocal<java.lang.Integer> -PsiReferenceExpression:i : java.lang.ThreadLocal<java.lang.Integer> -PsiReferenceExpression:i : java.lang.ThreadLocal<java.lang.Integer> -PsiReferenceExpression:i : java.lang.ThreadLocal<java.lang.Integer> - -Conversions: -++i -> $qualifier$.set($qualifier$.get() + 1) ++$qualifier$ ---i -> $qualifier$.set($qualifier$.get() - 1) --$qualifier$ -i == 0 -> $qualifier$.get() == $val$ $qualifier$==$val$ -i++ -> $qualifier$.set($qualifier$.get() + 1) $qualifier$++ -i-- -> $qualifier$.set($qualifier$.get() - 1) $qualifier$-- - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directInt/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directInt/after/Test.java deleted file mode 100644 index 627739bc4b1c..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directInt/after/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -class Test { - ThreadLocal<Integer> i; - - void foo() { - i.set(i.get() + 1); - i.set(i.get() + 1); - i.set(i.get() - 1); - i.set(i.get() - 1); - if (i.get() == 0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directInt/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directInt/before/Test.java deleted file mode 100644 index 9039f28e9617..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directInt/before/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -class Test { - int i; - - void foo() { - i++; - ++i; - i--; - --i; - if (i == 0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directString/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directString/after/Test.items deleted file mode 100644 index 29d4312a8580..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directString/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiField:myS : java.lang.ThreadLocal<java.lang.String> -PsiReferenceExpression:myS : java.lang.ThreadLocal<java.lang.String> -PsiReferenceExpression:myS : java.lang.ThreadLocal<java.lang.String> - -Conversions: -myS -> $qualifier$.get() $qualifier$ myS - -New expression type changes: -Fails: -""->java.lang.ThreadLocal<java.lang.String> diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directString/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directString/after/Test.java deleted file mode 100644 index 949869096327..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directString/after/Test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - ThreadLocal<String> myS = ""; - - void foo() { - if (myS == null) { - System.out.println(myS.get()); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directString/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directString/before/Test.java deleted file mode 100644 index 8ee02790f113..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directString/before/Test.java +++ /dev/null @@ -1,9 +0,0 @@ -class Test { - String myS = ""; - - void foo() { - if (myS == null) { - System.out.println(myS); - } - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/languageLevel/after/Test.items b/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/languageLevel/after/Test.items deleted file mode 100644 index 09a2a211ae6a..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/languageLevel/after/Test.items +++ /dev/null @@ -1,22 +0,0 @@ -Types: -PsiBinaryExpression:i == 0 : boolean -PsiField:i : java.lang.ThreadLocal -PsiPostfixExpression:i++ : java.lang.ThreadLocal -PsiPostfixExpression:i-- : java.lang.ThreadLocal -PsiPrefixExpression:++i : java.lang.ThreadLocal -PsiPrefixExpression:--i : java.lang.ThreadLocal -PsiReferenceExpression:i : java.lang.ThreadLocal -PsiReferenceExpression:i : java.lang.ThreadLocal -PsiReferenceExpression:i : java.lang.ThreadLocal -PsiReferenceExpression:i : java.lang.ThreadLocal -PsiReferenceExpression:i : java.lang.ThreadLocal - -Conversions: -++i -> $qualifier$.set(new java.lang.Integer(((java.lang.Integer)$qualifier$.get()).intValue() + 1)) ++$qualifier$ ---i -> $qualifier$.set(new java.lang.Integer(((java.lang.Integer)$qualifier$.get()).intValue() - 1)) --$qualifier$ -i == 0 -> ((java.lang.Integer)$qualifier$.get()).intValue() == $val$ $qualifier$==$val$ -i++ -> $qualifier$.set(new java.lang.Integer(((java.lang.Integer)$qualifier$.get()).intValue() + 1)) $qualifier$++ -i-- -> $qualifier$.set(new java.lang.Integer(((java.lang.Integer)$qualifier$.get()).intValue() - 1)) $qualifier$-- - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/languageLevel/after/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/languageLevel/after/Test.java deleted file mode 100644 index 81e5fe05d6dd..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/languageLevel/after/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -class Test { - ThreadLocal i; - - void foo() { - i.set(new Integer(((Integer) i.get()).intValue() + 1)); - i.set(new Integer(((Integer) i.get()).intValue() + 1)); - i.set(new Integer(((Integer) i.get()).intValue() - 1)); - i.set(new Integer(((Integer) i.get()).intValue() - 1)); - if (((Integer) i.get()).intValue() == 0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/languageLevel/before/Test.java b/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/languageLevel/before/Test.java deleted file mode 100644 index 9039f28e9617..000000000000 --- a/plugins/typeMigration/testData/refactoring/typeMigrationByThreadLocal/languageLevel/before/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -class Test { - int i; - - void foo() { - i++; - ++i; - i--; - --i; - if (i == 0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/assignmentExtends/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/assignmentExtends/after/Test.items deleted file mode 100644 index b39d716277ba..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/assignmentExtends/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:p : java.util.ArrayList<? extends java.lang.Integer> -PsiReferenceExpression:p : java.util.ArrayList<? extends java.lang.Integer> - -Conversions: - -New expression type changes: -Fails: -p[0]->java.util.ArrayList<? extends java.lang.Integer> diff --git a/plugins/typeMigration/testData/refactoring/wildcard/assignmentExtends/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/assignmentExtends/after/test.java deleted file mode 100644 index 16a620ef2e6d..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/assignmentExtends/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<? extends Integer> p) { - p[0] = new Integer(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/assignmentExtends/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/assignmentExtends/before/test.java deleted file mode 100644 index 4a148c3bd6fe..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/assignmentExtends/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(Integer[] p) { - p[0] = new Integer(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/assignmentSuper/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/assignmentSuper/after/Test.items deleted file mode 100644 index 8ee86c529545..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/assignmentSuper/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiArrayAccessExpression:p[0] : java.lang.Integer -PsiParameter:p : java.util.ArrayList<? super java.lang.Integer> -PsiReferenceExpression:p : java.util.ArrayList<? super java.lang.Integer> - -Conversions: -p[0] -> $qualifier$.set($idx$, $expr$) $qualifier$[$idx$] = $expr$ p[0] = new Integer(0) - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/wildcard/assignmentSuper/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/assignmentSuper/after/test.java deleted file mode 100644 index 25cab7a9d34c..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/assignmentSuper/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<? super Integer> p) { - p.set(0, new Integer(0)); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/assignmentSuper/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/assignmentSuper/before/test.java deleted file mode 100644 index 4a148c3bd6fe..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/assignmentSuper/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(Integer[] p) { - p[0] = new Integer(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/assignmentUnbounded/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/assignmentUnbounded/after/Test.items deleted file mode 100644 index e2bbfc48b834..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/assignmentUnbounded/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:p : java.util.ArrayList<?> -PsiReferenceExpression:p : java.util.ArrayList<?> - -Conversions: - -New expression type changes: -Fails: -p[0]->java.util.ArrayList<?> diff --git a/plugins/typeMigration/testData/refactoring/wildcard/assignmentUnbounded/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/assignmentUnbounded/after/test.java deleted file mode 100644 index 4804293a696e..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/assignmentUnbounded/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<?> p) { - p[0] = new Integer(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/assignmentUnbounded/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/assignmentUnbounded/before/test.java deleted file mode 100644 index 4a148c3bd6fe..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/assignmentUnbounded/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(Integer[] p) { - p[0] = new Integer(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/consumerExtends/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/consumerExtends/after/Test.items deleted file mode 100644 index 455ebca21125..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/consumerExtends/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiMethodCallExpression:p.get(0) : java.lang.Number -PsiParameter:p : java.util.ArrayList<? extends java.lang.Number> -PsiReferenceExpression:p : java.util.ArrayList<? extends java.lang.Number> - -Conversions: -p.get(0) -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/wildcard/consumerExtends/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/consumerExtends/after/test.java deleted file mode 100644 index b403162051ad..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/consumerExtends/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<? extends Number> p, Number p2) { - p2 = p.get(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/consumerExtends/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/consumerExtends/before/test.java deleted file mode 100644 index 649da301cc82..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/consumerExtends/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<Number> p, Number p2) { - p2 = p.get(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/consumerSuper/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/consumerSuper/after/Test.items deleted file mode 100644 index e4f5c3fc2088..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/consumerSuper/after/Test.items +++ /dev/null @@ -1,12 +0,0 @@ -Types: -PsiMethodCallExpression:p.get(0) : java.lang.Object -PsiParameter:p : java.util.ArrayList<? super java.lang.Number> -PsiParameter:p2 : java.lang.Object -PsiReferenceExpression:p : java.util.ArrayList<? super java.lang.Number> -PsiReferenceExpression:p2 : java.lang.Object - -Conversions: -p.get(0) -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/wildcard/consumerSuper/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/consumerSuper/after/test.java deleted file mode 100644 index 2c315ea3a723..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/consumerSuper/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<? super Number> p, Object p2) { - p2 = p.get(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/consumerSuper/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/consumerSuper/before/test.java deleted file mode 100644 index 649da301cc82..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/consumerSuper/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<Number> p, Number p2) { - p2 = p.get(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/consumerUnbounded/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/consumerUnbounded/after/Test.items deleted file mode 100644 index a0b14b30985e..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/consumerUnbounded/after/Test.items +++ /dev/null @@ -1,12 +0,0 @@ -Types: -PsiMethodCallExpression:p.get(0) : java.lang.Object -PsiParameter:p : java.util.ArrayList<?> -PsiParameter:p2 : java.lang.Object -PsiReferenceExpression:p : java.util.ArrayList<?> -PsiReferenceExpression:p2 : java.lang.Object - -Conversions: -p.get(0) -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/wildcard/consumerUnbounded/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/consumerUnbounded/after/test.java deleted file mode 100644 index f10b5e2ae860..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/consumerUnbounded/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<?> p, Object p2) { - p2 = p.get(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/consumerUnbounded/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/consumerUnbounded/before/test.java deleted file mode 100644 index 649da301cc82..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/consumerUnbounded/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<Number> p, Number p2) { - p2 = p.get(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToChildType/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToChildType/after/Test.items deleted file mode 100644 index 1ac8dc86d9ca..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToChildType/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiMethodCallExpression:p.get(0) : java.lang.Number -PsiParameter:p : java.lang.Integer[] -PsiReferenceExpression:p : java.lang.Integer[] - -Conversions: -p.get(0) -> $qualifier$[$i$] $qualifier$.get($i$) p.get(0) - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToChildType/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToChildType/after/test.java deleted file mode 100644 index bfe5eb68baba..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToChildType/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(Integer[] p) { - Number n = p[0]; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToChildType/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToChildType/before/test.java deleted file mode 100644 index bbddcc1a4d79..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToChildType/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<? extends Number> p) { - Number n = p.get(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToSuperType/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToSuperType/after/Test.items deleted file mode 100644 index a4ea13d41b29..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToSuperType/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:p : java.lang.Object[] -PsiReferenceExpression:p : java.lang.Object[] - -Conversions: - -New expression type changes: -Fails: -p->java.lang.Object[] diff --git a/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToSuperType/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToSuperType/after/test.java deleted file mode 100644 index 96208756fe87..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToSuperType/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(Object[] p) { - Number n = p.get(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToSuperType/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToSuperType/before/test.java deleted file mode 100644 index bbddcc1a4d79..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToSuperType/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<? extends Number> p) { - Number n = p.get(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToType/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToType/after/Test.items deleted file mode 100644 index a0fd8df506c4..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToType/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiMethodCallExpression:p.get(0) : java.lang.Number -PsiParameter:p : java.lang.Number[] -PsiReferenceExpression:p : java.lang.Number[] - -Conversions: -p.get(0) -> $qualifier$[$i$] $qualifier$.get($i$) p.get(0) - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToType/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToType/after/test.java deleted file mode 100644 index 33a962b96171..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToType/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(Number[] p) { - Number n = p[0]; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToType/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToType/before/test.java deleted file mode 100644 index bbddcc1a4d79..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/getAssignmentExtendsToType/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<? extends Number> p) { - Number n = p.get(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/getExtends/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/getExtends/after/Test.items deleted file mode 100644 index d68b720f5d5b..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/getExtends/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiArrayAccessExpression:p[0] : java.lang.Integer -PsiParameter:p : java.util.ArrayList<? extends java.lang.Integer> -PsiReferenceExpression:p : java.util.ArrayList<? extends java.lang.Integer> - -Conversions: -p[0] -> $qualifier$.get($idx$) $qualifier$[$idx$] - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/wildcard/getExtends/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/getExtends/after/test.java deleted file mode 100644 index 529d4942a2ce..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/getExtends/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<? extends Integer> p) { - Integer p1 = p.get(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/getExtends/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/getExtends/before/test.java deleted file mode 100644 index 685d78f23f3d..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/getExtends/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(Integer[] p) { - Integer p1 = p[0]; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/getSuper/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/getSuper/after/Test.items deleted file mode 100644 index 5300a386dc23..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/getSuper/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:p : java.util.ArrayList<? super java.lang.Integer> -PsiReferenceExpression:p : java.util.ArrayList<? super java.lang.Integer> - -Conversions: - -New expression type changes: -Fails: -p[0]->java.util.ArrayList<? super java.lang.Integer> diff --git a/plugins/typeMigration/testData/refactoring/wildcard/getSuper/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/getSuper/after/test.java deleted file mode 100644 index eebb4c1f2dbb..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/getSuper/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<? super Integer> p) { - Integer p1 = p[0]; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/getSuper/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/getSuper/before/test.java deleted file mode 100644 index 685d78f23f3d..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/getSuper/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(Integer[] p) { - Integer p1 = p[0]; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/getUnbounded/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/getUnbounded/after/Test.items deleted file mode 100644 index e2bbfc48b834..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/getUnbounded/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:p : java.util.ArrayList<?> -PsiReferenceExpression:p : java.util.ArrayList<?> - -Conversions: - -New expression type changes: -Fails: -p[0]->java.util.ArrayList<?> diff --git a/plugins/typeMigration/testData/refactoring/wildcard/getUnbounded/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/getUnbounded/after/test.java deleted file mode 100644 index 9ab43aa01dbe..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/getUnbounded/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<?> p) { - Integer p1 = p[0]; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/getUnbounded/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/getUnbounded/before/test.java deleted file mode 100644 index 685d78f23f3d..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/getUnbounded/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(Integer[] p) { - Integer p1 = p[0]; - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/lengthSize/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/lengthSize/after/Test.items deleted file mode 100644 index bf63b11ab5b2..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/lengthSize/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiParameter:p : java.util.ArrayList<?> -PsiReferenceExpression:p : java.util.ArrayList<?> -PsiReferenceExpression:p.length : int - -Conversions: -p.length -> $qualifier$.size() $qualifier$.length - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/wildcard/lengthSize/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/lengthSize/after/test.java deleted file mode 100644 index 4f0770adbfb5..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/lengthSize/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<?> p) { - System.out.println(p.size()); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/lengthSize/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/lengthSize/before/test.java deleted file mode 100644 index e8758383dd0a..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/lengthSize/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(Integer[] p) { - System.out.println(p.length); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerCollectionChanged/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/producerCollectionChanged/after/Test.items deleted file mode 100644 index fe9d55b37cda..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerCollectionChanged/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiMethodCallExpression:p.add(new Integer(8)) : boolean -PsiParameter:p : java.util.Set<? super java.lang.Integer> -PsiReferenceExpression:p : java.util.Set<? super java.lang.Integer> - -Conversions: -p.add(new Integer(8)) -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerCollectionChanged/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/producerCollectionChanged/after/test.java deleted file mode 100644 index 25825f1f78c0..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerCollectionChanged/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(Set<? super Integer> p) { - p.add(new Integer(8)); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerCollectionChanged/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/producerCollectionChanged/before/test.java deleted file mode 100644 index d8cf544f6fde..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerCollectionChanged/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<? super Number> p) { - p.add(new Integer(8)); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerExtends/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/producerExtends/after/Test.items deleted file mode 100644 index 8b996f4d00e1..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerExtends/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiMethodCallExpression:p.set(0, new Integer(8)) : java.lang.Number -PsiParameter:p : java.util.ArrayList<? extends java.lang.Number> -PsiReferenceExpression:p : java.util.ArrayList<? extends java.lang.Number> - -Conversions: -p.set(0, new Integer(8)) -> $ - -New expression type changes: -Fails: -new Integer(8)->? extends java.lang.Number diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerExtends/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/producerExtends/after/test.java deleted file mode 100644 index f8f4f761d73a..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerExtends/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<? extends Number> p) { - p.set(0, new Integer(8)); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerExtends/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/producerExtends/before/test.java deleted file mode 100644 index b5e9a24ad373..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerExtends/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<? super Number> p) { - p.set(0, new Integer(8)); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerExtendsCollectionChanged/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/producerExtendsCollectionChanged/after/Test.items deleted file mode 100644 index 88976428ea99..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerExtendsCollectionChanged/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiMethodCallExpression:p.add(new Integer(8)) : boolean -PsiParameter:p : java.util.Set<? extends java.lang.Object> -PsiReferenceExpression:p : java.util.Set<? extends java.lang.Object> - -Conversions: -p.add(new Integer(8)) -> $ - -New expression type changes: -Fails: -new Integer(8)->? extends java.lang.Object diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerExtendsCollectionChanged/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/producerExtendsCollectionChanged/after/test.java deleted file mode 100644 index 0c24d5791d14..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerExtendsCollectionChanged/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(Set<? extends Object> p) { - p.add(new Integer(8)); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerExtendsCollectionChanged/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/producerExtendsCollectionChanged/before/test.java deleted file mode 100644 index d8cf544f6fde..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerExtendsCollectionChanged/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<? super Number> p) { - p.add(new Integer(8)); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerExtendsFailToStopAtWildcard/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/producerExtendsFailToStopAtWildcard/after/Test.items deleted file mode 100644 index f2f5bb75a60f..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerExtendsFailToStopAtWildcard/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiMethodCallExpression:p1.add(p2) : boolean -PsiParameter:p1 : java.util.List<? extends java.lang.Number> -PsiReferenceExpression:p1 : java.util.List<? extends java.lang.Number> - -Conversions: -p1.add(p2) -> $ - -New expression type changes: -Fails: -p2->? extends java.lang.Number diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerExtendsFailToStopAtWildcard/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/producerExtendsFailToStopAtWildcard/after/test.java deleted file mode 100644 index 5d4d6fda25a2..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerExtendsFailToStopAtWildcard/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(List<? extends Number> p1, Number p2){ - p1.add(p2); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerExtendsFailToStopAtWildcard/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/producerExtendsFailToStopAtWildcard/before/test.java deleted file mode 100644 index a2e2cb2ae329..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerExtendsFailToStopAtWildcard/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(List<Number> p1, Number p2){ - p1.add(p2); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerFailToStopAtWildcard/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/producerFailToStopAtWildcard/after/Test.items deleted file mode 100644 index 9d9b2e2a447f..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerFailToStopAtWildcard/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiMethodCallExpression:p1.add(p2) : boolean -PsiParameter:p1 : java.util.List<? super java.lang.Integer> -PsiReferenceExpression:p1 : java.util.List<? super java.lang.Integer> - -Conversions: -p1.add(p2) -> $ - -New expression type changes: -Fails: -p2->? super java.lang.Integer diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerFailToStopAtWildcard/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/producerFailToStopAtWildcard/after/test.java deleted file mode 100644 index bbc30114137e..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerFailToStopAtWildcard/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(List<? super Integer> p1, Number p2){ - p1.add(p2); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerFailToStopAtWildcard/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/producerFailToStopAtWildcard/before/test.java deleted file mode 100644 index a2e2cb2ae329..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerFailToStopAtWildcard/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(List<Number> p1, Number p2){ - p1.add(p2); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerStopAtWildcard/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/producerStopAtWildcard/after/Test.items deleted file mode 100644 index 2f3689b42ba5..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerStopAtWildcard/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiMethodCallExpression:p1.add(p2) : boolean -PsiParameter:p1 : java.util.List<? super java.lang.Number> -PsiReferenceExpression:p1 : java.util.List<? super java.lang.Number> - -Conversions: -p1.add(p2) -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerStopAtWildcard/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/producerStopAtWildcard/after/test.java deleted file mode 100644 index 353f0432f59d..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerStopAtWildcard/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(List<? super Number> p1, Number p2){ - p1.add(p2); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerStopAtWildcard/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/producerStopAtWildcard/before/test.java deleted file mode 100644 index a2e2cb2ae329..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerStopAtWildcard/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(List<Number> p1, Number p2){ - p1.add(p2); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerSuper/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/producerSuper/after/Test.items deleted file mode 100644 index b0c91006b9d1..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerSuper/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiMethodCallExpression:p.set(0, new Integer(8)) : java.lang.Object -PsiParameter:p : java.util.ArrayList<? super java.lang.Integer> -PsiReferenceExpression:p : java.util.ArrayList<? super java.lang.Integer> - -Conversions: -p.set(0, new Integer(8)) -> $ - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerSuper/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/producerSuper/after/test.java deleted file mode 100644 index 0769f09a7b7a..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerSuper/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<? super Integer> p) { - p.set(0, new Integer(8)); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerSuper/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/producerSuper/before/test.java deleted file mode 100644 index b5e9a24ad373..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerSuper/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<? super Number> p) { - p.set(0, new Integer(8)); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerUnbounded/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/producerUnbounded/after/Test.items deleted file mode 100644 index e2b8ee35fcd2..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerUnbounded/after/Test.items +++ /dev/null @@ -1,11 +0,0 @@ -Types: -PsiMethodCallExpression:p.set(0, new Integer(8)) : java.lang.Object -PsiParameter:p : java.util.ArrayList<?> -PsiReferenceExpression:p : java.util.ArrayList<?> - -Conversions: -p.set(0, new Integer(8)) -> $ - -New expression type changes: -Fails: -new Integer(8)->? diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerUnbounded/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/producerUnbounded/after/test.java deleted file mode 100644 index 37a2f8fcac83..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerUnbounded/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<?> p) { - p.set(0, new Integer(8)); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/producerUnbounded/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/producerUnbounded/before/test.java deleted file mode 100644 index b5e9a24ad373..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/producerUnbounded/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ArrayList<? super Number> p) { - p.set(0, new Integer(8)); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalConsumerExtends/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/threadLocalConsumerExtends/after/Test.items deleted file mode 100644 index 7ae170499472..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalConsumerExtends/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiMethodCallExpression:l.substring(0) : java.lang.String -PsiParameter:l : java.lang.ThreadLocal<? extends java.lang.String> -PsiReferenceExpression:l : java.lang.ThreadLocal<? extends java.lang.String> - -Conversions: -l.substring(0) -> $qualifier$.get() $qualifier$ l - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalConsumerExtends/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/threadLocalConsumerExtends/after/test.java deleted file mode 100644 index 5275db851a70..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalConsumerExtends/after/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - void method(ThreadLocal<? extends String> l) { - l.get().substring(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalConsumerExtends/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/threadLocalConsumerExtends/before/test.java deleted file mode 100644 index 8805129f7191..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalConsumerExtends/before/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - void method(String l) { - l.substring(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalConsumerSuper/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/threadLocalConsumerSuper/after/Test.items deleted file mode 100644 index d05d101463c7..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalConsumerSuper/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:l : java.lang.ThreadLocal<? super java.lang.String> -PsiReferenceExpression:l : java.lang.ThreadLocal<? super java.lang.String> - -Conversions: - -New expression type changes: -Fails: -l->java.lang.ThreadLocal<? super java.lang.String> diff --git a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalConsumerSuper/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/threadLocalConsumerSuper/after/test.java deleted file mode 100644 index beb0d0ebef46..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalConsumerSuper/after/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - void method(ThreadLocal<? super String> l) { - l.substring(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalConsumerSuper/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/threadLocalConsumerSuper/before/test.java deleted file mode 100644 index 8805129f7191..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalConsumerSuper/before/test.java +++ /dev/null @@ -1,5 +0,0 @@ -class Test { - void method(String l) { - l.substring(0); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalProducerExtends/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/threadLocalProducerExtends/after/Test.items deleted file mode 100644 index 47a89e441962..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalProducerExtends/after/Test.items +++ /dev/null @@ -1,9 +0,0 @@ -Types: -PsiParameter:l : java.lang.ThreadLocal<java.util.List<? extends java.lang.String>> -PsiReferenceExpression:l : java.lang.ThreadLocal<java.util.List<? extends java.lang.String>> - -Conversions: - -New expression type changes: -Fails: -l->java.lang.ThreadLocal<java.util.List<? extends java.lang.String>> diff --git a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalProducerExtends/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/threadLocalProducerExtends/after/test.java deleted file mode 100644 index 93724be5c0dd..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalProducerExtends/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ThreadLocal<List<? extends String>> l) { - l.add(""); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalProducerExtends/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/threadLocalProducerExtends/before/test.java deleted file mode 100644 index 8df669c77899..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalProducerExtends/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(List<String> l) { - l.add(""); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalProducerSuper/after/Test.items b/plugins/typeMigration/testData/refactoring/wildcard/threadLocalProducerSuper/after/Test.items deleted file mode 100644 index 736189db2585..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalProducerSuper/after/Test.items +++ /dev/null @@ -1,10 +0,0 @@ -Types: -PsiMethodCallExpression:l.add("") : boolean -PsiParameter:l : java.lang.ThreadLocal<java.util.List<? super java.lang.String>> -PsiReferenceExpression:l : java.lang.ThreadLocal<java.util.List<? super java.lang.String>> - -Conversions: -l.add("") -> $qualifier$.get() $qualifier$ l - -New expression type changes: -Fails: diff --git a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalProducerSuper/after/test.java b/plugins/typeMigration/testData/refactoring/wildcard/threadLocalProducerSuper/after/test.java deleted file mode 100644 index fb3b568ca1b0..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalProducerSuper/after/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(ThreadLocal<List<? super String>> l) { - l.get().add(""); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalProducerSuper/before/test.java b/plugins/typeMigration/testData/refactoring/wildcard/threadLocalProducerSuper/before/test.java deleted file mode 100644 index 8df669c77899..000000000000 --- a/plugins/typeMigration/testData/refactoring/wildcard/threadLocalProducerSuper/before/test.java +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.*; - -class Test { - void method(List<String> l) { - l.add(""); - } -}
\ No newline at end of file diff --git a/plugins/typeMigration/typeMigration.iml b/plugins/typeMigration/typeMigration.iml deleted file mode 100644 index ac3679760ed4..000000000000 --- a/plugins/typeMigration/typeMigration.iml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="util" /> - <orderEntry type="module" module-name="lang-api" /> - <orderEntry type="module" module-name="lang-impl" /> - <orderEntry type="module" module-name="openapi" /> - <orderEntry type="module" module-name="structuralsearch" /> - <orderEntry type="module" module-name="java-impl" /> - <orderEntry type="module" module-name="testFramework-java" scope="TEST" /> - <orderEntry type="module" module-name="structuralsearch-java" /> - </component> -</module> - |