MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-20 13:31:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

[debugger] fixes for IJ-CR-149390

Browse Source 
GitOrigin-RevId: 2276613d23ae0a19b5d730de5d1734d340c296e0
This commit is contained in:
Egor Ushakov
2024-11-25 17:52:54 +01:00
committed by intellij-monorepo-bot
parent 285b225e6f
commit 4d28a3a308
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
java/java-runtime/src/com/intellij/rt/debugger/MethodInvoker.java
View File

@@ -5,8 +5,6 @@ import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import java.lang.invoke.WrongMethodTypeException;
import java.lang.reflect.Array;
import java.util.Arrays;
@SuppressWarnings({"SSBasedInspection", "unused"})
public final class MethodInvoker {
@@ -201,22 +199,14 @@ public final class MethodInvoker {
}
}
Object result;
if (vararg && args.length == parameterCount - 1) { // add an empty array if no vararg parameters passed
args = Arrays.copyOf(args, parameterCount);
args[args.length - 1] = Array.newInstance(lastParameterType.getComponentType(), 0);
}
if (args.length == 1 && args[0] == null) { // single null arg
result = method.asFixedArity().invoke((Object[])null);
}
else {
if (vararg && args.length == parameterCount && lastParameterType.isAssignableFrom(args[args.length - 1].getClass())) {
result = method.asFixedArity().invokeWithArguments(args);
}
else {
result = method.invokeWithArguments(args);
if (vararg && args.length == parameterCount) {
Object lastArg = args[args.length - 1];
if (lastArg == null || lastParameterType.isAssignableFrom(lastArg.getClass())) {
method = method.asFixedArity();
}
}
Object result = method.invokeWithArguments(args);
returnValue.set(result);
return result;
}