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

[debugger] properly fail on unsupported evaluation, IDEA-364870

Browse Source 
^IDEA-364870 fixed

GitOrigin-RevId: 6dee085d5994131ed3a6dccdabc2f9565dee0513
This commit is contained in:
Vladimir Parfinenko
2024-12-17 20:21:12 +00:00
committed by intellij-monorepo-bot
parent 3e5461494a
commit 853177a8be
2 changed files with 13 additions and 12 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
+12 -11
View File
@@ -195,7 +195,7 @@ public final class EvaluatorBuilderImpl implements EvaluatorBuilder {
@Override
public void visitTryStatement(@NotNull PsiTryStatement statement) {
if (statement.getResourceList() != null) {
throw new EvaluateRuntimeException(new UnsupportedExpressionException("Try with resources is not yet supported"));
throw unsupportedExpression("Try with resources is not yet supported");
}
Evaluator bodyEvaluator = accept(statement.getTryBlock());
if (bodyEvaluator != null) {
@@ -245,7 +245,7 @@ public final class EvaluatorBuilderImpl implements EvaluatorBuilder {
@Override
public void visitSynchronizedStatement(@NotNull PsiSynchronizedStatement statement) {
throw new EvaluateRuntimeException(new UnsupportedExpressionException("Synchronized is not yet supported"));
throw unsupportedExpression("Synchronized is not yet supported");
}
@Override
@@ -978,6 +978,11 @@ public final class EvaluatorBuilderImpl implements EvaluatorBuilder {
return new EvaluateRuntimeException(EvaluateExceptionUtil.createEvaluateException(message));
}
@Contract(pure = true) // to warn about unused result
private static EvaluateRuntimeException unsupportedExpression(String message) throws EvaluateRuntimeException {
return new EvaluateRuntimeException(new UnsupportedExpressionException(message));
}
@Override
public void visitSuperExpression(@NotNull PsiSuperExpression expression) {
if (LOG.isDebugEnabled()) {
@@ -1217,8 +1222,7 @@ public final class EvaluatorBuilderImpl implements EvaluatorBuilder {
if (psiMethod != null) {
signature = JVMNameUtil.getJVMSignature(psiMethod);
if (AnnotationUtil.isAnnotated(psiMethod, CommonClassNames.JAVA_LANG_INVOKE_MH_POLYMORPHIC, 0)) {
throw new EvaluateRuntimeException(new UnsupportedExpressionException(
JavaDebuggerBundle.message("evaluation.error.signature.polymorphic.call.evaluation.not.supported")));
throw unsupportedExpression(JavaDebuggerBundle.message("evaluation.error.signature.polymorphic.call.evaluation.not.supported"));
}
PsiClass methodPsiClass = psiMethod.getContainingClass();
@@ -1433,8 +1437,7 @@ public final class EvaluatorBuilderImpl implements EvaluatorBuilder {
@Override
public void visitLambdaExpression(@NotNull PsiLambdaExpression expression) {
throw new EvaluateRuntimeException(new UnsupportedExpressionException(
JavaDebuggerBundle.message("evaluation.error.lambda.evaluation.not.supported")));
throw unsupportedExpression(JavaDebuggerBundle.message("evaluation.error.lambda.evaluation.not.supported"));
}
@Override
@@ -1510,8 +1513,7 @@ public final class EvaluatorBuilderImpl implements EvaluatorBuilder {
LOG.error(e);
}
}
throw new EvaluateRuntimeException(
new UnsupportedExpressionException(JavaDebuggerBundle.message("evaluation.error.method.reference.evaluation.not.supported")));
throw unsupportedExpression(JavaDebuggerBundle.message("evaluation.error.method.reference.evaluation.not.supported"));
}
private Evaluator buildFromJavaCode(String code, String imports, @NotNull PsiElement context) {
@@ -1538,7 +1540,7 @@ public final class EvaluatorBuilderImpl implements EvaluatorBuilder {
}
}
else if (dimensions.length > 1) {
throw evaluateException(JavaDebuggerBundle.message("evaluation.error.multi.dimensional.arrays.creation.not.supported"));
throw unsupportedExpression(JavaDebuggerBundle.message("evaluation.error.multi.dimensional.arrays.creation.not.supported"));
}
Evaluator initializerEvaluator = null;
@@ -1581,8 +1583,7 @@ public final class EvaluatorBuilderImpl implements EvaluatorBuilder {
else if (expressionPsiType instanceof PsiClassType) { // must be a class ref
PsiClass aClass = CompilingEvaluatorTypesUtil.getClass((PsiClassType)expressionPsiType);
if (aClass instanceof PsiAnonymousClass) {
throw new EvaluateRuntimeException(new UnsupportedExpressionException(
JavaDebuggerBundle.message("evaluation.error.anonymous.class.evaluation.not.supported")));
throw unsupportedExpression(JavaDebuggerBundle.message("evaluation.error.anonymous.class.evaluation.not.supported"));
}
PsiExpressionList argumentList = expression.getArgumentList();
if (argumentList == null) {
java/debugger/openapi/resources/messages/JavaDebuggerBundle.properties
+1 -1
View File
@@ -123,7 +123,7 @@ evaluation.error.cannot.sources.for.field.class=Cannot find sources for class co
evaluation.error.identifier.expected=Identifier expected instead of ''{0}''
evaluation.error.cannot.evaluate.qualifier=Cannot evaluate qualifier ''{0}''
evaluation.error.invalid.array.dimension.expression=Invalid expression for array dimension: {0}
evaluation.error.multi.dimensional.arrays.creation.not.supported=Creation of multi-dimensional arrays not supported
evaluation.error.multi.dimensional.arrays.creation.not.supported=Creation of multi-dimensional arrays is not supported
evaluation.error.anonymous.class.evaluation.not.supported=Anonymous class evaluation is not supported
evaluation.error.lambda.evaluation.not.supported=Lambdas evaluation is not supported
evaluation.error.method.reference.evaluation.not.supported=Method reference evaluation is not supported