From 4f210cc69d8d456c72b7f7d49693223d4cc8413b Mon Sep 17 00:00:00 2001 From: Carsten Hammer Date: Sat, 7 Dec 2024 06:54:43 +0100 Subject: [PATCH 1/2] fix NPE in isClassQualifiedNameMatching --- .../jdt/internal/common/LambdaASTVisitor.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sandbox_common/src/org/sandbox/jdt/internal/common/LambdaASTVisitor.java b/sandbox_common/src/org/sandbox/jdt/internal/common/LambdaASTVisitor.java index 36726358..3c4fd630 100644 --- a/sandbox_common/src/org/sandbox/jdt/internal/common/LambdaASTVisitor.java +++ b/sandbox_common/src/org/sandbox/jdt/internal/common/LambdaASTVisitor.java @@ -624,13 +624,15 @@ public static boolean isClassQualifiedNameMatching(MethodInvocation methodInvoca Expression expression = methodInvocation.getExpression(); if (expression != null) { ITypeBinding typeBinding = expression.resolveTypeBinding(); - if (typeBinding != null && !typeBinding.isRecovered()) { - return qualifiedName.equals(typeBinding.getQualifiedName()); - } - if (expression instanceof SimpleName) { - String startswith=typeBinding.toString().substring(9); - startswith=startswith.substring(0, startswith.length()-1); - return qualifiedName.endsWith(startswith); + if (typeBinding != null) { + if (!typeBinding.isRecovered()) { + return qualifiedName.equals(typeBinding.getQualifiedName()); + } + if (expression instanceof SimpleName) { + String startswith=typeBinding.toString().substring(9); + startswith=startswith.substring(0, startswith.length()-1); + return qualifiedName.endsWith(startswith); + } } } else { IMethodBinding methodBinding = methodInvocation.resolveMethodBinding(); From 467d855ac8a334ac1f6a0233aeef62de6badeb75 Mon Sep 17 00:00:00 2001 From: Carsten Hammer Date: Sat, 7 Dec 2024 08:25:54 +0100 Subject: [PATCH 2/2] update to 4.35 --- pom.xml | 30 ++++++++++++++++++++++++++++-- sandbox_target/eclipse.target | 4 ++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index e9ccda3c..a3fbfc92 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ JavaSE-21 4.8.6.6 UTF-8 + epl_v1 sandbox_target @@ -60,7 +61,7 @@ eclipse p2 - https://download.eclipse.org/releases/2024-09 + https://download.eclipse.org/releases/2024-12 babel @@ -70,7 +71,7 @@ orbit p2 - https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09/ + https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12/