Fix step-over depth calculation consistency

Author: zspitzer

luceedebug/src/main/java/luceedebug/coreinject/NativeDebuggerListener.java

@@ -240,6 +240,12 @@ private static class StepState {
 		}
 	}
 
+	/**
+	 * Cached reflection method for DebuggerFrame.getLine().
+	 * Initialized lazily on first use in getStackDepth().
+	 */
+	private static volatile java.lang.reflect.Method debuggerFrameGetLineMethod = null;
+
 	public static void setNativeMode(boolean enabled) {
 		nativeMode = enabled;
 		Log.info("Native mode: " + enabled);
@@ -604,12 +610,29 @@ public static void stopStepping(long threadId) {
 	/**
 	 * Get the current stack depth for a PageContext.
 	 * Uses reflection to get debugger frames.
+	 * Only counts frames with line > 0 to match NativeDebugFrame.getNativeFrames() filtering.
 	 */
 	public static int getStackDepth(PageContext pc) {
 		try {
 			java.lang.reflect.Method getFrames = pc.getClass().getMethod("getDebuggerFrames");
 			Object[] frames = (Object[]) getFrames.invoke(pc);
-			return frames != null ? frames.length : 0;
+			if (frames == null || frames.length == 0) return 0;
+
+			// Cache the getLine method on first use
+			java.lang.reflect.Method getLine = debuggerFrameGetLineMethod;
+			if (getLine == null) {
+				getLine = frames[0].getClass().getMethod("getLine");
+				debuggerFrameGetLineMethod = getLine;
+			}
+
+			// Count only frames with line > 0 (matching getNativeFrames filtering)
+			// Frames start with line=0 before first ExecutionLog.start() call
+			int count = 0;
+			for (Object frame : frames) {
+				int line = (int) getLine.invoke(frame);
+				if (line > 0) count++;
+			}
+			return count;
 		} catch (Exception e) {
 			// Log error - silent failure could cause incorrect step behavior
 			Log.error("Error getting stack depth: " + e.getMessage());

luceedebug/src/main/java/luceedebug/coreinject/NativeLuceeVm.java

@@ -336,10 +336,11 @@ public void stepOut(long threadID) {
 
 	/**
 	 * Get the current stack depth for a thread using native debugger frames.
+	 * Uses NativeDebuggerListener.getStackDepth() to count only real frames (not synthetic).
 	 */
 	private int getStackDepthForThread(long threadID) {
-		IDebugFrame[] frames = getStackTrace(threadID);
-		return frames != null ? frames.length : 0;
+		PageContext pc = NativeDebuggerListener.getPageContext(threadID);
+		return pc != null ? NativeDebuggerListener.getStackDepth(pc) : 0;
 	}
 
 	// ========== Debug utilities ==========

test/cfml/SteppingTest.cfc

@@ -35,9 +35,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="dap" {
 				teardownDap();
 			} );
 
-			it( "validates line numbers in stepping-target", function() {
-				if ( notSupportsBreakpointLocations() ) return skip();
-
+			it( title="validates line numbers in stepping-target", skip=notSupportsBreakpointLocations(), body=function() {
 				var locations = dap.breakpointLocations( variables.targetFile, 1, 35 );
 				var validLines = locations.body.breakpoints.map( function( bp ) { return bp.line; } );