修改调试时单步跃入时bug

Author: CppCXY

CMakeLists.txt

@@ -65,7 +65,7 @@ elseif(${EMMY_LUA_VERSION} STREQUAL "jit")
     #add_definitions(-DEMMY_LUA_JIT_SUPPORT_LUA_SETFUNCS)
 endif()
 
-add_definitions(-DEMMY_CORE_VERSION="1.0.16")
+add_definitions(-DEMMY_CORE_VERSION="1.2.7")
 
 if(EMMY_USE_LUA_SOURCE)
     add_definitions(-DEMMY_USE_LUA_SOURCE)

emmy_debugger/src/hook_state.cpp

@@ -96,12 +96,18 @@ bool HookStateStepIn::Start(std::shared_ptr<Debugger> debugger, lua_State* curre
 void HookStateStepIn::ProcessHook(std::shared_ptr<Debugger> debugger, lua_State* L, lua_Debug* ar)
 {
 	UpdateStackLevel(debugger, L, ar);
-	if (getDebugEvent(ar) == LUA_HOOKLINE && getDebugCurrentLine(ar) != line)
+	if (getDebugEvent(ar) == LUA_HOOKLINE)
 	{
-		// todo : && file != ar->source
-		debugger->HandleBreak();
+		auto currentLine = getDebugCurrentLine(ar);
+		auto source = getDebugSource(ar);
+		if(currentLine != line || file != source)
+		{
+			debugger->HandleBreak();
+		}
+		return;
 	}
-	else StackLevelBasedState::ProcessHook(debugger, L, ar);
+
+	StackLevelBasedState::ProcessHook(debugger, L, ar);
 }
 
 bool HookStateStepOut::Start(std::shared_ptr<Debugger> debugger, lua_State* current)