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-201942 Do not use compiling evaluator for method references - arrays constructors support

Browse Source
This commit is contained in:
Egor Ushakov
2018-11-08 20:02:53 +03:00
parent ad0eab2be1
commit bd1fc42186
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/EvaluatorBuilderImpl.java
+25 -13
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.impl.JavaConstantExpressionEvaluator;
import com.intellij.psi.tree.IElementType;
@@ -1212,9 +1213,10 @@ public class EvaluatorBuilderImpl implements EvaluatorBuilder {
PsiElement qualifier = expression.getQualifier();
PsiType interfaceType = expression.getFunctionalInterfaceType();
if (!Registry.is("debugger.compiling.evaluator.method.refs") && interfaceType != null && qualifier != null) {
PsiElement resolved = expression.resolve();
if (resolved instanceof PsiMethod) {
try {
String code = null;
try {
PsiElement resolved = expression.resolve();
if (resolved instanceof PsiMethod) {
PsiMethod method = (PsiMethod)resolved;
PsiClass containingClass = method.getContainingClass();
if (containingClass != null) {
@@ -1234,25 +1236,35 @@ public class EvaluatorBuilderImpl implements EvaluatorBuilder {
bind = "mh = mh.bindTo(" + qualifier.getText() + ")\n";
}
}
String code =
code =
"MethodType mt = MethodType.fromMethodDescriptorString(\"" + JVMNameUtil.getJVMSignature(method) + "\", null);\n" +
"MethodHandle mh = MethodHandles.publicLookup()." + findMethodName + "(" +
containingClass.getQualifiedName() + ".class " + methodName + ", mt);\n" +
bind +
"MethodHandleProxies.asInterfaceInstance(" + interfaceType.getCanonicalText() + ".class, mh);";
myResult = buildFromJavaCode(code,
"java.lang.invoke.MethodHandle," +
"java.lang.invoke.MethodHandleProxies," +
"java.lang.invoke.MethodHandles," +
"java.lang.invoke.MethodType",
expression);
return;
}
} else if (PsiUtil.isArrayClass(resolved)) {
// TODO: may use MethodHandles#arrayConstructor when we move to Java 9
code =
"MethodType mt = MethodType.methodType(Object.class, Class.class, int.class);\n" +
"MethodHandle mh = MethodHandles.publicLookup().findStatic(Array.class, \"newInstance\", mt);\n" +
"mh = mh.bindTo(" + StringUtil.substringBeforeLast(qualifier.getText(), "[]") + ".class)\n" +
"MethodHandleProxies.asInterfaceInstance(" + interfaceType.getCanonicalText() + ".class, mh);";
}
catch (Exception e) {
LOG.error(e);
if (code != null) {
myResult = buildFromJavaCode(code,
"java.lang.invoke.MethodHandle," +
"java.lang.invoke.MethodHandleProxies," +
"java.lang.invoke.MethodHandles," +
"java.lang.invoke.MethodType," +
"java.lang.reflect.Array",
expression);
return;
}
}
catch (Exception e) {
LOG.error(e);
}
}
throw new EvaluateRuntimeException(
new UnsupportedExpressionException(DebuggerBundle.message("evaluation.error.method.reference.evaluation.not.supported")));