Bug 558907 - Step over should filter lambda synthetic line

When stepping over the last line of a lambda body, the debugger will
hold at a synthetic line that is not visible in the source code. This
change ensures such lines are filtered by step over.

Change-Id: I15d61b2f4ef5becefb9a5d3558dc12c5664581ee
Signed-off-by: Simeon Andreev <[email protected]>
Reviewed-on: https://git.eclipse.org/r/c/jdt/eclipse.jdt.debug/+/189240
Tested-by: Andrey Loskutov <[email protected]>
Tested-by: JDT Bot <[email protected]>
Reviewed-by: Andrey Loskutov <[email protected]>

Author: trancexpress

org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java

@@ -2787,8 +2787,8 @@ public boolean handleEvent(Event event, JDIDebugTarget target,
 					fStepResultTimeoutTriggered.set(false);
 				}
 
+				Location stepOverLocation2 = fStepOverLocation;
 				if (getStepKind() == StepRequest.STEP_OVER) {
-					Location stepOverLocation2 = fStepOverLocation;
 					if (stepOverLocation2 != null && fStepOverFrameCount >= 0) {
 						int underlyingFrameCount = getUnderlyingFrameCount();
 						if (underlyingFrameCount > fStepOverFrameCount) {
@@ -2824,7 +2824,8 @@ public boolean handleEvent(Event event, JDIDebugTarget target,
 				// a filtered location, or if we're back where
 				// we started on a step into, do another step of the same kind
 				if (locationShouldBeFiltered(currentLocation)
-						|| shouldDoExtraStepInto(currentLocation)) {
+						|| shouldDoExtraStepInto(currentLocation)
+						|| (getStepKind() == StepRequest.STEP_OVER && isSyntheticAndNotAvailable(currentLocation, stepOverLocation2))) {
 					setRunning(true);
 					deleteStepRequest();
 					createSecondaryStepRequest();
@@ -2985,6 +2986,22 @@ protected void abort() {
 				fStepOverFrameCount =  -1;
 			}
 		}
+
+		private boolean isSyntheticAndNotAvailable(Location currentLocation, Location previousLocation) {
+			if (previousLocation != null) {
+				Method method = previousLocation.method();
+				if (method != null && method.isSynthetic()) {
+					boolean isLambdaMethod = LambdaUtils.isLambdaMethod(method);
+					if (isLambdaMethod) {
+						int currentLineNumber = currentLocation.lineNumber();
+						if (currentLineNumber == -1) {
+							return true;
+						}
+					}
+				}
+			}
+			return false;
+		}
 	}
 
 	/**

org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/LambdaUtils.java

@@ -13,7 +13,6 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.debug.core.model;
 
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -31,11 +30,15 @@
 import org.eclipse.jdt.internal.debug.core.logicalstructures.JDILambdaVariable;
 import org.eclipse.jdt.internal.debug.eval.ast.engine.IRuntimeContext;
 
+import com.sun.jdi.Method;
+
 /**
  * Utility class for Lambda Expressions and Stack frames Place holder for all Lambda operation encapsulation.
  */
 public class LambdaUtils {
 
+	private static final String LAMBDA_METHOD_PREFIX = "lambda$"; //$NON-NLS-1$
+
 	/**
 	 * Inspects the top stack frame of the context; if that frame is a lambda frame, looks for a variable with the specified name in that frame and
 	 * two frames below that frame.
@@ -121,7 +124,7 @@ public static boolean isLambdaFrame(IStackFrame frame) throws DebugException {
 	 * @since 3.8
 	 */
 	public static boolean isLambdaFrame(IJavaStackFrame frame) throws DebugException {
-		return frame.isSynthetic() && frame.getName().startsWith("lambda$"); //$NON-NLS-1$
+		return frame.isSynthetic() && frame.getName().startsWith(LAMBDA_METHOD_PREFIX);
 	}
 
 	/**
@@ -136,6 +139,18 @@ public static boolean isLambdaField(IVariable variable) throws DebugException {
 		return (variable instanceof IJavaFieldVariable) && ((IJavaFieldVariable) variable).getDeclaringType().getName().contains("$Lambda$"); //$NON-NLS-1$
 	}
 
+	/**
+	 * Returns if the method is a lambda method.
+	 *
+	 * @param method
+	 *            the method for which to check
+	 * @return <code>True</code> if the method is a lambda method else return <code>False</code>
+	 * @since 3.20
+	 */
+	public static boolean isLambdaMethod(Method method) {
+		return method.name().startsWith(LAMBDA_METHOD_PREFIX);
+	}
+
 	private static boolean isLambdaObjectVariable(IVariable variable) {
 		return variable instanceof JDILambdaVariable;
 	}