Variable Navigation throwing NPE

Variable Navigation throwing NPE for non-java projects

Fix: #712

Author: subyssurendran666

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/NavigateToVarDeclAction.java

@@ -30,6 +30,7 @@
 import org.eclipse.jdt.core.dom.ASTParser;
 import org.eclipse.jdt.core.dom.ASTVisitor;
 import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.LambdaExpression;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
@@ -58,10 +59,22 @@ public void run(IAction action) {
 				Object frame = DebugUITools.getDebugContext();
 				if (frame instanceof IStackFrame jFrame) {
 					if (jFrame instanceof IJavaStackFrame javaStackFrame) {
+						IJavaProject iJavaProject = null;
 						String type = javaStackFrame.getLaunch().getLaunchConfiguration().getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String) null);
+						for (IJavaProject proj : JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()).getJavaProjects()) {
+							IType type2 = proj.findType(javaStackFrame.getDeclaringTypeName());
+							if (type2 != null && type2.exists()) {
+								iJavaProject = proj;
+							}
+						}
+						if (iJavaProject == null && type != null) {
+							IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(type);
+							iJavaProject = JavaCore.create(project);
+						}
 						IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(type);
-						IJavaProject iJavaProject = JavaCore.create(project);
+						iJavaProject = JavaCore.create(project);
 						IType iType = iJavaProject.findType(javaStackFrame.getReceivingTypeName());
+						int currentLine = javaStackFrame.getLineNumber();
 						String currentMethod = javaStackFrame.getMethodName();
 						List<String> frameParams = javaStackFrame.getArgumentTypeNames();
 						List<String> ref = frameParams.stream().map(e -> {
@@ -80,39 +93,84 @@ public void run(IAction action) {
 						ast.accept(new ASTVisitor() {
 							boolean meth = false;
 							boolean found = false;
+							boolean inTargetContext = false;
 							@Override
 							public boolean visit(MethodDeclaration node) {
 								if (node.getName().getIdentifier().equals(currentMethod)) {
 									List<Object> parameters = node.parameters();
 									List<String> methodParams = parameters.stream().map(p -> ((SingleVariableDeclaration) p).getType().toString()).toList();
-									if (methodParams.equals(ref)) {
-										meth = true;
-										for (Object op : node.parameters()) {
-											SingleVariableDeclaration parm = (SingleVariableDeclaration) op;
-											if (parm.getName().getIdentifier().equals(name)) {
-												highlightLine(ast, cu, node.getStartPosition());
-												found = true;
-												return false;
+									int start = node.getStartPosition();
+									int end = start + node.getLength();
+									int startLine = ast.getLineNumber(start);
+									int endLine = ast.getLineNumber(end);
+									if (currentLine >= startLine && currentLine <= endLine) {
+										inTargetContext = true;
+										if (methodParams.equals(ref)) {
+											meth = true;
+											for (Object op : node.parameters()) {
+												SingleVariableDeclaration parm = (SingleVariableDeclaration) op;
+												if (parm.getName().getIdentifier().equals(name)) {
+													highlightLine(ast, cu, node.getStartPosition());
+													found = true;
+													return false;
+												}
 											}
+											return true;
 										}
-										return true;
 									}
 								}
 								return true;
 							}
 
+							@Override
+							public void endVisit(MethodDeclaration node) {
+								inTargetContext = false;
+							}
+
 							@Override
 							public boolean visit(VariableDeclarationFragment node) {
 								if (found) {
 									return false;
 								}
-								if (meth && node.getName().getIdentifier().equals(name)) {
+								if ((meth || inTargetContext) && node.getName().getIdentifier().equals(name)) {
 									found = true;
 									highlightLine(ast, cu, node.getStartPosition());
 									return false;
 								}
 								return true;
 							}
+
+							@Override
+							public boolean visit(LambdaExpression node) {
+								if (found) {
+									return false;
+								}
+								List<Object> parameters = node.parameters();
+								int start = node.getStartPosition();
+								int end = start + node.getLength();
+								int startLine = ast.getLineNumber(start);
+								int endLine = ast.getLineNumber(end);
+								if (currentLine >= startLine && currentLine <= endLine) {
+									inTargetContext = true;
+									for (Object param : parameters) {
+										if (param instanceof SingleVariableDeclaration) {
+											SingleVariableDeclaration svd = (SingleVariableDeclaration) param;
+											if (svd.getName().getIdentifier().equals(name)) {
+												highlightLine(ast, cu, svd.getStartPosition());
+												found = true;
+												return false;
+											}
+										}
+									}
+								}
+								return true;
+
+							}
+
+							@Override
+							public void endVisit(LambdaExpression node) {
+								inTargetContext = false;
+							}
 						});
 					}
 				}