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

IDEA-172425 Fix broken tests

Browse Source
This commit is contained in:
Vitaliy.Bibaev
2018-03-27 15:52:29 +03:00
parent d3cffd2163
commit 75575ba508
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/extractMethodObject/reflect/ReflectionAccessMethodBuilder.java
+7 -5
View File
@@ -118,22 +118,24 @@ public class ReflectionAccessMethodBuilder {
for (int i = 0; i < parameters.length; i++) {
PsiParameter parameter = parameters[i];
String name = parameter.getName();
String type = eraseGenerics(parameter.getType());
PsiType parameterType = parameter.getType();
PsiType erasedType = TypeConversionUtil.erasure(parameterType);
String typeName = typeName(parameterType, erasedType);
String jvmType = erasedType != null ? extractJvmType(erasedType) : typeName;
if (name == null) {
LOG.info("Parameter name not found, index = " + i + ", type = " + type);
LOG.info("Parameter name not found, index = " + i + ", type = " + typeName);
name = "arg" + i;
}
myParameters.add(new ParameterInfo(type, name, extractJvmType(parameter.getType())));
myParameters.add(new ParameterInfo(typeName, name, jvmType));
}
return this;
}
@NotNull
private static String eraseGenerics(@NotNull PsiType type) {
PsiType erasedType = TypeConversionUtil.erasure(type);
private static String typeName(@NotNull PsiType type, @Nullable PsiType erasedType) {
if (erasedType == null) {
String typeName = type.getCanonicalText();
int typeParameterIndex = typeName.indexOf('<');