PyDev fixes: fix built-in breakpoints behavior

GitOrigin-RevId: 7e69ce7a8fa78428af2a3da18720db1f3222f16f

python/helpers/pydev/_pydevd_bundle/pydevd_additional_thread_info_regular.py

@@ -7,7 +7,7 @@ from _pydev_bundle import pydev_log
 from _pydevd_bundle.pydevd_frame import PyDBFrame
 # ENDIF
 
-version = 15
+version = 16
 
 if not hasattr(sys, '_current_frames'):
 

python/helpers/pydev/_pydevd_bundle/pydevd_cython.pyx

@@ -13,7 +13,7 @@ pydev_log.debug("Using Cython speedups")
 # from _pydevd_bundle.pydevd_frame import PyDBFrame
 # ENDIF
 
-version = 15
+version = 16
 
 if not hasattr(sys, '_current_frames'):
 
@@ -581,7 +581,13 @@ cdef class PyDBFrame:
         # ENDIF
 
         main_debugger, filename, info, thread, frame_skips_cache, frame_cache_key = self._args
+
         # print('frame trace_dispatch %s %s %s %s %s' % (frame.f_lineno, frame.f_code.co_name, frame.f_code.co_filename, event, info.pydev_step_cmd))
+
+        # The thread can be already suspended by another function, e.g. built-in breakpoint hook.
+        if info.is_tracing:
+            return None
+
         try:
             info.is_tracing = True
             line = frame.f_lineno

python/helpers/pydev/_pydevd_bundle/pydevd_frame.py

@@ -436,7 +436,13 @@ class PyDBFrame:
         # ENDIF
 
         main_debugger, filename, info, thread, frame_skips_cache, frame_cache_key = self._args
+
         # print('frame trace_dispatch %s %s %s %s %s' % (frame.f_lineno, frame.f_code.co_name, frame.f_code.co_filename, event, info.pydev_step_cmd))
+
+        # The thread can be already suspended by another function, e.g. built-in breakpoint hook.
+        if info.is_tracing:
+            return None
+
         try:
             info.is_tracing = True
             line = frame.f_lineno

python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java

@@ -1734,10 +1734,13 @@ public class PythonDebuggerTest extends PyEnvTestCase {
     runPythonTest(new PyDebuggerTask("/debug", "test_builtin_break.py") {
       @Override
       public void before() {
+        toggleBreakpoint(getFilePath(getScriptName()),2);
       }
 
       @Override
       public void testing() throws Exception {
+        waitForPause();
+        resume();
         waitForPause();
         eval("a").hasValue("1");
         resume();