ruby_debugger/exception.vim @@ -17,6 +17,7 @@ command! -nargs=1 RdbCommand :call g:RubyDebugger.send_command(<q-args>) command! -nargs=0 RdbTest :call g:RubyDebugger.run_test() command! -nargs=1 RdbEval :call g:RubyDebugger.eval(<q-args>) command! -nargs=1 RdbCond :call g:RubyDebugger.conditional_breakpoint(<q-args>) +command! -nargs=1 RdbCatch :call g:RubyDebugger.catch_exception(<q-args>) if exists("g:ruby_debugger_loaded") "finish @@ -352,7 +353,7 @@ endfunction " *** Public interface (start) -let RubyDebugger = { 'commands': {}, 'variables': {}, 'settings': {}, 'breakpoints': [], 'frames': [] } +let RubyDebugger = { 'commands': {}, 'variables': {}, 'settings': {}, 'breakpoints': [], 'frames': [], 'exceptions': [] } let g:RubyDebugger.queue = s:Queue.new() @@ -364,6 +365,7 @@ function! RubyDebugger.start(...) dict echo "Loading debugger..." call g:RubyDebugger.server.start(script) + let g:RubyDebugger.exceptions = [] for breakpoint in g:RubyDebugger.breakpoints call g:RubyDebugger.queue.add(breakpoint.command()) endfor @@ -397,8 +399,12 @@ function! RubyDebugger.receive_command() dict call g:RubyDebugger.commands.jump_to_breakpoint(cmd) elseif match(cmd, '<suspended ') != -1 call g:RubyDebugger.commands.jump_to_breakpoint(cmd) + elseif match(cmd, '<exception ') != -1 + call g:RubyDebugger.commands.handle_exception(cmd) elseif match(cmd, '<breakpointAdded ') != -1 call g:RubyDebugger.commands.set_breakpoint(cmd) + elseif match(cmd, '<catchpointSet ') != -1 + call g:RubyDebugger.commands.set_exception(cmd) elseif match(cmd, '<variables>') != -1 call g:RubyDebugger.commands.set_variables(cmd) elseif match(cmd, '<error>') != -1 @@ -515,6 +521,23 @@ function! RubyDebugger.conditional_breakpoint(exp) dict endfunction +" Catch all exceptions with given name +function! RubyDebugger.catch_exception(exp) dict + if has_key(g:RubyDebugger, 'server') && g:RubyDebugger.server.is_running() + let quoted = s:quotify(a:exp) + let exception = s:Exception.new(quoted) + call add(g:RubyDebugger.exceptions, exception) + if s:breakpoints_window.is_open() + call s:breakpoints_window.open() + exe "wincmd p" + endif + call g:RubyDebugger.queue.execute() + else + echo "Sorry, but you can set Exceptional Breakpoints only with running debugger" + endif +endfunction + + " Next function! RubyDebugger.next() dict call g:RubyDebugger.queue.add("next") @@ -594,6 +617,23 @@ function! RubyDebugger.commands.jump_to_breakpoint(cmd) dict endfunction +" <exception file="test.rb" line="1" type="NameError" message="some exception message" threadId="4" /> +" Show message error and jump to given file/line +function! RubyDebugger.commands.handle_exception(cmd) dict + let message_match = matchlist(a:cmd, 'message="\(.\{-}\)"') + call g:RubyDebugger.commands.jump_to_breakpoint(a:cmd) + echo "Exception message: " . s:unescape_html(message_match[1]) +endfunction + + +" <catchpointSet exception="NoMethodError"/> +" Confirm setting of exception catcher +function! RubyDebugger.commands.set_exception(cmd) dict + let attrs = s:get_tag_attributes(a:cmd) + call g:RubyDebugger.logger.put("Exception successfully set: " . attrs.exception) +endfunction + + " <breakpointAdded no="1" location="test.rb:2" /> " Add debugger info to breakpoints (pid of debugger, debugger breakpoint's id) " Assign rest breakpoints to debugger recursively, if there are breakpoints @@ -1038,6 +1078,8 @@ function! s:WindowBreakpoints.render() dict for breakpoint in g:RubyDebugger.breakpoints let breakpoints .= breakpoint.render() endfor + let exceptions = map(copy(g:RubyDebugger.exceptions), 'v:val.render()') + let breakpoints .= "\nException breakpoints: " . join(exceptions, ", ") return breakpoints endfunction @@ -1611,6 +1653,49 @@ endfunction " *** Breakpoint class (end) +" *** Exception class (start) +" These are ruby exceptions we catch with 'catch Exception' command +" (:RdbCatch) + +let s:Exception = { } + +" ** Public methods + +" Constructor of new exception. +function! s:Exception.new(name) + let var = copy(self) + let var.name = a:name + call var._log("Trying to set exception: " . var.name) + call g:RubyDebugger.queue.add(var.command()) + return var +endfunction + + +" Command for setting exception (e.g.: 'catch NameError') +function! s:Exception.command() dict + return 'catch ' . self.name +endfunction + + +" Output format for Breakpoints Window +function! s:Exception.render() dict + return self.name +endfunction + + +" ** Private methods + + +function! s:Exception._log(string) dict + call g:RubyDebugger.logger.put(a:string) +endfunction + + +" *** Exception class (end) + + + + " *** Frame class (start) let s:Frame = { } additionals/plugin/ruby_debugger_test.vim @@ -17,6 +17,7 @@ command! -nargs=1 RdbCommand :call g:RubyDebugger.send_command(<q-args>) command! -nargs=0 RdbTest :call g:RubyDebugger.run_test() command! -nargs=1 RdbEval :call g:RubyDebugger.eval(<q-args>) command! -nargs=1 RdbCond :call g:RubyDebugger.conditional_breakpoint(<q-args>) +command! -nargs=1 RdbCatch :call g:RubyDebugger.catch_exception(<q-args>) if exists("g:ruby_debugger_loaded") "finish ruby_debugger/before.vim @@ -15,6 +15,23 @@ function! RubyDebugger.commands.jump_to_breakpoint(cmd) dict endfunction +" <exception file="test.rb" line="1" type="NameError" message="some exception message" threadId="4" /> +" Show message error and jump to given file/line +function! RubyDebugger.commands.handle_exception(cmd) dict + let message_match = matchlist(a:cmd, 'message="\(.\{-}\)"') + call g:RubyDebugger.commands.jump_to_breakpoint(a:cmd) + echo "Exception message: " . s:unescape_html(message_match[1]) +endfunction + + +" <catchpointSet exception="NoMethodError"/> +" Confirm setting of exception catcher +function! RubyDebugger.commands.set_exception(cmd) dict + let attrs = s:get_tag_attributes(a:cmd) + call g:RubyDebugger.logger.put("Exception successfully set: " . attrs.exception) +endfunction + + " <breakpointAdded no="1" location="test.rb:2" /> " Add debugger info to breakpoints (pid of debugger, debugger breakpoint's id) " Assign rest breakpoints to debugger recursively, if there are breakpoints ruby_debugger/commands.vim @@ -1,6 +1,6 @@ " *** Public interface (start) -let RubyDebugger = { 'commands': {}, 'variables': {}, 'settings': {}, 'breakpoints': [], 'frames': [] } +let RubyDebugger = { 'commands': {}, 'variables': {}, 'settings': {}, 'breakpoints': [], 'frames': [], 'exceptions': [] } let g:RubyDebugger.queue = s:Queue.new() @@ -12,6 +12,7 @@ function! RubyDebugger.start(...) dict echo "Loading debugger..." call g:RubyDebugger.server.start(script) + let g:RubyDebugger.exceptions = [] for breakpoint in g:RubyDebugger.breakpoints call g:RubyDebugger.queue.add(breakpoint.command()) endfor @@ -45,8 +46,12 @@ function! RubyDebugger.receive_command() dict call g:RubyDebugger.commands.jump_to_breakpoint(cmd) elseif match(cmd, '<suspended ') != -1 call g:RubyDebugger.commands.jump_to_breakpoint(cmd) + elseif match(cmd, '<exception ') != -1 + call g:RubyDebugger.commands.handle_exception(cmd) elseif match(cmd, '<breakpointAdded ') != -1 call g:RubyDebugger.commands.set_breakpoint(cmd) + elseif match(cmd, '<catchpointSet ') != -1 + call g:RubyDebugger.commands.set_exception(cmd) elseif match(cmd, '<variables>') != -1 call g:RubyDebugger.commands.set_variables(cmd) elseif match(cmd, '<error>') != -1 @@ -163,6 +168,23 @@ function! RubyDebugger.conditional_breakpoint(exp) dict endfunction +" Catch all exceptions with given name +function! RubyDebugger.catch_exception(exp) dict + if has_key(g:RubyDebugger, 'server') && g:RubyDebugger.server.is_running() + let quoted = s:quotify(a:exp) + let exception = s:Exception.new(quoted) + call add(g:RubyDebugger.exceptions, exception) + if s:breakpoints_window.is_open() + call s:breakpoints_window.open() + exe "wincmd p" + endif + call g:RubyDebugger.queue.execute() + else + echo "Sorry, but you can set Exceptional Breakpoints only with running debugger" + endif +endfunction + + " Next function! RubyDebugger.next() dict call g:RubyDebugger.queue.add("next") ruby_debugger/public.vim @@ -19,6 +19,8 @@ function! s:WindowBreakpoints.render() dict for breakpoint in g:RubyDebugger.breakpoints let breakpoints .= breakpoint.render() endfor + let exceptions = map(copy(g:RubyDebugger.exceptions), 'v:val.render()') + let breakpoints .= "\nException breakpoints: " . join(exceptions, ", ") return breakpoints endfunction ruby_debugger/window_breakpoints.vim @@ -12,6 +12,7 @@ ruby_debugger/var_child.vim ruby_debugger/var_parent.vim ruby_debugger/logger.vim ruby_debugger/breakpoint.vim +ruby_debugger/exception.vim ruby_debugger/frame.vim ruby_debugger/server.vim ruby_debugger/after.vim ruby_debugger_plan.txt @@ -54,7 +54,8 @@ class VimRubyDebugger output = read_socket(response, @rdebug) @result << output # If we stop at breakpoint, add taking of local variables into queue - if output =~ /<breakpoint / || output =~ /<suspended / + stop_commands = [ '<breakpoint ', '<suspended ', '<exception ' ] + if stop_commands.any? { |c| output.include?(c) } @queue << "var local" @queue << "where" end vim/bin/ruby_debugger.rb @@ -17,6 +17,7 @@ command! -nargs=1 RdbCommand :call g:RubyDebugger.send_command(<q-args>) command! -nargs=0 RdbTest :call g:RubyDebugger.run_test() command! -nargs=1 RdbEval :call g:RubyDebugger.eval(<q-args>) command! -nargs=1 RdbCond :call g:RubyDebugger.conditional_breakpoint(<q-args>) +command! -nargs=1 RdbCatch :call g:RubyDebugger.catch_exception(<q-args>) if exists("g:ruby_debugger_loaded") "finish @@ -352,7 +353,7 @@ endfunction " *** Public interface (start) -let RubyDebugger = { 'commands': {}, 'variables': {}, 'settings': {}, 'breakpoints': [], 'frames': [] } +let RubyDebugger = { 'commands': {}, 'variables': {}, 'settings': {}, 'breakpoints': [], 'frames': [], 'exceptions': [] } let g:RubyDebugger.queue = s:Queue.new() @@ -364,6 +365,7 @@ function! RubyDebugger.start(...) dict echo "Loading debugger..." call g:RubyDebugger.server.start(script) + let g:RubyDebugger.exceptions = [] for breakpoint in g:RubyDebugger.breakpoints call g:RubyDebugger.queue.add(breakpoint.command()) endfor @@ -397,8 +399,12 @@ function! RubyDebugger.receive_command() dict call g:RubyDebugger.commands.jump_to_breakpoint(cmd) elseif match(cmd, '<suspended ') != -1 call g:RubyDebugger.commands.jump_to_breakpoint(cmd) + elseif match(cmd, '<exception ') != -1 + call g:RubyDebugger.commands.handle_exception(cmd) elseif match(cmd, '<breakpointAdded ') != -1 call g:RubyDebugger.commands.set_breakpoint(cmd) + elseif match(cmd, '<catchpointSet ') != -1 + call g:RubyDebugger.commands.set_exception(cmd) elseif match(cmd, '<variables>') != -1 call g:RubyDebugger.commands.set_variables(cmd) elseif match(cmd, '<error>') != -1 @@ -515,6 +521,23 @@ function! RubyDebugger.conditional_breakpoint(exp) dict endfunction +" Catch all exceptions with given name +function! RubyDebugger.catch_exception(exp) dict + if has_key(g:RubyDebugger, 'server') && g:RubyDebugger.server.is_running() + let quoted = s:quotify(a:exp) + let exception = s:Exception.new(quoted) + call add(g:RubyDebugger.exceptions, exception) + if s:breakpoints_window.is_open() + call s:breakpoints_window.open() + exe "wincmd p" + endif + call g:RubyDebugger.queue.execute() + else + echo "Sorry, but you can set Exceptional Breakpoints only with running debugger" + endif +endfunction + + " Next function! RubyDebugger.next() dict call g:RubyDebugger.queue.add("next") @@ -594,6 +617,23 @@ function! RubyDebugger.commands.jump_to_breakpoint(cmd) dict endfunction +" <exception file="test.rb" line="1" type="NameError" message="some exception message" threadId="4" /> +" Show message error and jump to given file/line +function! RubyDebugger.commands.handle_exception(cmd) dict + let message_match = matchlist(a:cmd, 'message="\(.\{-}\)"') + call g:RubyDebugger.commands.jump_to_breakpoint(a:cmd) + echo "Exception message: " . s:unescape_html(message_match[1]) +endfunction + + +" <catchpointSet exception="NoMethodError"/> +" Confirm setting of exception catcher +function! RubyDebugger.commands.set_exception(cmd) dict + let attrs = s:get_tag_attributes(a:cmd) + call g:RubyDebugger.logger.put("Exception successfully set: " . attrs.exception) +endfunction + + " <breakpointAdded no="1" location="test.rb:2" /> " Add debugger info to breakpoints (pid of debugger, debugger breakpoint's id) " Assign rest breakpoints to debugger recursively, if there are breakpoints @@ -1038,6 +1078,8 @@ function! s:WindowBreakpoints.render() dict for breakpoint in g:RubyDebugger.breakpoints let breakpoints .= breakpoint.render() endfor + let exceptions = map(copy(g:RubyDebugger.exceptions), 'v:val.render()') + let breakpoints .= "\nException breakpoints: " . join(exceptions, ", ") return breakpoints endfunction @@ -1611,6 +1653,49 @@ endfunction " *** Breakpoint class (end) +" *** Exception class (start) +" These are ruby exceptions we catch with 'catch Exception' command +" (:RdbCatch) + +let s:Exception = { } + +" ** Public methods + +" Constructor of new exception. +function! s:Exception.new(name) + let var = copy(self) + let var.name = a:name + call var._log("Trying to set exception: " . var.name) + call g:RubyDebugger.queue.add(var.command()) + return var +endfunction + + +" Command for setting exception (e.g.: 'catch NameError') +function! s:Exception.command() dict + return 'catch ' . self.name +endfunction + + +" Output format for Breakpoints Window +function! s:Exception.render() dict + return self.name +endfunction + + +" ** Private methods + + +function! s:Exception._log(string) dict + call g:RubyDebugger.logger.put(a:string) +endfunction + + +" *** Exception class (end) + + + + " *** Frame class (start) let s:Frame = { } vim/plugin/ruby_debugger.vim 7e3e892d5fab5c8d956be43babe8820a2d6699e8 Anton Astashov anton@astashov.net http://github.com/astashov/vim-ruby-debugger/commit/0aef16abe9271dd3dd4afd090d51c5be820eeffc 0aef16abe9271dd3dd4afd090d51c5be820eeffc 2009-11-05T18:20:07-08:00 2009-11-05T18:20:07-08:00 Added :RdbCatch command. It allows to set exception catchers, if exception is raised, it will show exception message and jump to file/line of the exception. Usage: ':RdbCatch ExceptionName'. 38084897445b75391ee7f5fe68f8be83f9ce3716 Anton Astashov anton@astashov.net