MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

inline: wrap varargs in array initializer

Browse Source
This commit is contained in:
Anna.Kozlova
2016-04-29 20:30:56 +02:00
parent 4a8977e6fa
commit afb9d3e446
1 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/util/InlineUtil.java
+52 -36
View File
@@ -74,46 +74,36 @@ public class InlineUtil {
expr = (PsiExpression)ChangeContextUtil.decodeContextInfo(expr, thisClass, thisAccessExpr);
PsiType exprType = RefactoringUtil.getTypeByExpression(expr);
if (exprType != null && !exprType.equals(varType)) {
boolean matchedTypes = false;
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory();
if (expr instanceof PsiCallExpression && ((PsiCallExpression)expr).getTypeArguments().length == 0) {
final JavaResolveResult resolveResult = ((PsiCallExpression)initializer).resolveMethodGenerics();
final PsiElement resolved = resolveResult.getElement();
if (resolved instanceof PsiMethod) {
final PsiTypeParameter[] typeParameters = ((PsiMethod)resolved).getTypeParameters();
if (typeParameters.length > 0) {
final PsiCallExpression copy = (PsiCallExpression)expr.copy();
for (final PsiTypeParameter typeParameter : typeParameters) {
final PsiType substituted = resolveResult.getSubstitutor().substitute(typeParameter);
if (substituted == null) break;
copy.getTypeArgumentList().add(elementFactory.createTypeElement(substituted));
}
if (varType.equals(copy.getType())) {
((PsiCallExpression)expr).getTypeArgumentList().replace(copy.getTypeArgumentList());
if (expr instanceof PsiMethodCallExpression) {
final PsiReferenceExpression methodExpression = ((PsiMethodCallExpression)expr).getMethodExpression();
final PsiExpression qualifierExpression = methodExpression.getQualifierExpression();
if (qualifierExpression == null) {
final PsiMethod method = (PsiMethod)resolved;
final PsiClass containingClass = method.getContainingClass();
LOG.assertTrue(containingClass != null);
if (method.getModifierList().hasModifierProperty(PsiModifier.STATIC)) {
methodExpression.setQualifierExpression(elementFactory.createReferenceExpression(containingClass));
} else {
methodExpression.setQualifierExpression(createThisExpression(manager, thisClass, refParent));
}
}
}
matchedTypes = true;
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory();
PsiMethod method = qualifyWithExplicitTypeArguments(initializer, expr, varType);
if (method != null) {
if (expr instanceof PsiMethodCallExpression) {
final PsiReferenceExpression methodExpression = ((PsiMethodCallExpression)expr).getMethodExpression();
final PsiExpression qualifierExpression = methodExpression.getQualifierExpression();
if (qualifierExpression == null) {
final PsiClass containingClass = method.getContainingClass();
LOG.assertTrue(containingClass != null);
if (method.getModifierList().hasModifierProperty(PsiModifier.STATIC)) {
methodExpression.setQualifierExpression(elementFactory.createReferenceExpression(containingClass));
} else {
methodExpression.setQualifierExpression(createThisExpression(method.getManager(), thisClass, refParent));
}
}
}
}
boolean insertCastWhenUnchecked =
!(exprType instanceof PsiClassType && ((PsiClassType)exprType).isRaw() && parent instanceof PsiExpressionList);
if (!matchedTypes && (expr instanceof PsiFunctionalExpression || !PsiPolyExpressionUtil.isPolyExpression(expr) && insertCastWhenUnchecked)) {
expr = surroundWithCast(variable, expr);
else if (varType instanceof PsiEllipsisType &&
((PsiEllipsisType)varType).getComponentType().equals(exprType)) { //convert vararg to array
final PsiExpressionList argumentList = PsiTreeUtil.getParentOfType(expr, PsiExpressionList.class);
LOG.assertTrue(argumentList != null);
final PsiExpression[] arguments = argumentList.getExpressions();
String varargsWrapper = "new " + exprType.getCanonicalText() + "[]{" + StringUtil.join(Arrays.asList(arguments), PsiElement::getText, ",") + '}';
expr.replace(elementFactory.createExpressionFromText(varargsWrapper, argumentList));
}
else {
boolean insertCastWhenUnchecked = !(exprType instanceof PsiClassType && ((PsiClassType)exprType).isRaw() && parent instanceof PsiExpressionList);
if (expr instanceof PsiFunctionalExpression || !PsiPolyExpressionUtil.isPolyExpression(expr) && insertCastWhenUnchecked) {
expr = surroundWithCast(variable, expr);
}
}
}
@@ -122,6 +112,32 @@ public class InlineUtil {
return expr;
}
private static PsiMethod qualifyWithExplicitTypeArguments(PsiExpression initializer,
PsiExpression expr,
PsiType varType) {
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(initializer.getProject()).getElementFactory();
if (expr instanceof PsiCallExpression && ((PsiCallExpression)expr).getTypeArguments().length == 0) {
final JavaResolveResult resolveResult = ((PsiCallExpression)initializer).resolveMethodGenerics();
final PsiElement resolved = resolveResult.getElement();
if (resolved instanceof PsiMethod) {
final PsiTypeParameter[] typeParameters = ((PsiMethod)resolved).getTypeParameters();
if (typeParameters.length > 0) {
final PsiCallExpression copy = (PsiCallExpression)expr.copy();
for (final PsiTypeParameter typeParameter : typeParameters) {
final PsiType substituted = resolveResult.getSubstitutor().substitute(typeParameter);
if (substituted == null) break;
copy.getTypeArgumentList().add(elementFactory.createTypeElement(substituted));
}
if (varType.equals(copy.getType())) {
((PsiCallExpression)expr).getTypeArgumentList().replace(copy.getTypeArgumentList());
return (PsiMethod)resolved;
}
}
}
}
return null;
}
private static PsiExpression surroundWithCast(PsiVariable variable, PsiExpression expr) {
PsiTypeCastExpression cast = (PsiTypeCastExpression)JavaPsiFacade.getElementFactory(expr.getProject()).createExpressionFromText("(t)a", null);
PsiTypeElement castTypeElement = cast.getCastType();