Merge pull request #214 from Charlie-83/master

Don't jump to source after commands that don't progress the program

Author: sakhnik

lib/gdb_commands.py

@@ -29,14 +29,19 @@ def __init__(self):
         self.thrd = None
         self.fallback_to_parsing = False
         self.state = "stopped"
+        self.exited_or_ran = False
 
         def handle_continue(event):
             self.state = "running"
+            self.exited_or_ran = True
         gdb.events.cont.connect(handle_continue)
         def handle_stop(event):
             self.state = "stopped"
+        def handle_exit(event):
+            self.state = "stopped"
+            self.exited_or_ran = True
         gdb.events.stop.connect(handle_stop)
-        gdb.events.exited.connect(handle_stop)
+        gdb.events.exited.connect(handle_exit)
 
     def invoke(self, arg, from_tty):
         if not self.thrd:
@@ -84,6 +89,9 @@ def _handle_command(self, command, sock, addr):
         elif request == "get-current-frame-location":
             self._send_response(self._get_current_frame_location(),
                                 req_id, sock, addr)
+        elif request == "has-exited-or-ran":
+            self._send_response(self._get_reset_exited_or_ran(),
+                                req_id, sock, addr)
         elif request == "handle-command":
             # pylint: disable=broad-except
             try:
@@ -119,6 +127,12 @@ def _send_response(self, response, req_id, sock, addr):
     def _get_process_state(self):
         return self.state
 
+    def _get_reset_exited_or_ran(self):
+        if (self.exited_or_ran):
+            self.exited_or_ran = False
+            return True
+        return False
+
     def _get_current_frame_location(self):
         try:
             frame = gdb.selected_frame()

lua/nvimgdb/backend/gdb.lua

@@ -29,6 +29,9 @@ function C.create_parser(actions, proxy)
   local self = setmetatable({}, P)
   self:_init(actions)
 
+  P.prev_fname = nil
+  P.prev_line = nil
+
   function P:query_paused()
     log.debug({"P:query_paused"})
     coroutine.resume(coroutine.create(function()
@@ -40,7 +43,12 @@ function C.create_parser(actions, proxy)
         if #location == 2 then
           local fname = location[1]
           local line = location[2]
-          self.actions:jump_to_source(fname, line)
+          if (fname ~= self.prev_fname or line ~= self.prev_line) or
+              proxy:query('has-exited-or-ran') then
+            self.prev_line = line
+            self.prev_fname = fname
+            self.actions:jump_to_source(fname, line)
+          end
         end
       end
       self.actions:query_breakpoints()