Merge pull request #67 from ruby-debug/rm-protocol-extensions

RubyMine-specific protocol extensions

Author: os97673

bin/rdebug-ide

@@ -19,7 +19,8 @@ options = OpenStruct.new(
   'tracing'     => false,
   'int_handler' => true,
   'dispatcher_port' => -1,
-  'evaluation_timeout' => 10
+  'evaluation_timeout' => 10,
+  'rm_protocol_extensions' => false
 )
 
 opts = OptionParser.new do |opts|
@@ -54,6 +55,9 @@ EOB
 
   opts.on("--keep-frame-binding", "Keep frame bindings") {options.frame_bind = true}
   opts.on("--disable-int-handler", "Disables interrupt signal handler") {options.int_handler = false}
+  opts.on("--rubymine-protocol-extensions", "Enable RubyMine-specific incompatible protocol extensions") do
+    options.rm_protocol_extensions = true
+  end
   opts.separator ""
   opts.separator "Common options:"
   opts.on_tail("-v", "--version", "Show version") do
@@ -112,6 +116,7 @@ end
 Debugger.keep_frame_binding = options.frame_bind
 Debugger.tracing = options.tracing
 Debugger.evaluation_timeout = options.evaluation_timeout
+Debugger.rm_protocol_extensions = options.rm_protocol_extensions
 
 Debugger.debug_program(options)
 

lib/ruby-debug-ide.rb

@@ -41,7 +41,7 @@ def cleanup_backtrace(backtrace)
        cleared
     end
 
-    attr_accessor :cli_debug, :xml_debug, :evaluation_timeout
+    attr_accessor :cli_debug, :xml_debug, :evaluation_timeout, :rm_protocol_extensions
     attr_accessor :control_thread
     attr_reader :interface
 

lib/ruby-debug-ide/ide_processor.rb

@@ -28,21 +28,21 @@ def process_commands
         s.interface = @interface
       end
       event_cmds = Command.commands.map{|cmd| cmd.new(state, @printer) }
-      while !state.proceed? do
+      until state.proceed? do
         input = @interface.command_queue.pop
         catch(:debug_error) do
           splitter[input].each do |input|
             # escape % since print_debug might use printf
             @printer.print_debug "Processing in context: #{input.gsub('%', '%%')}"
-            if cmd = event_cmds.find { |c| c.match(input) }
+            if (cmd = event_cmds.find { |c| c.match(input) })
               if context.dead? && cmd.class.need_context
                 @printer.print_msg "Command is unavailable\n"
               else
                 cmd.execute
               end
             else
               @printer.print_msg "Unknown command: #{input}"
-            end            
+            end
           end
         end
         state.restore_context

lib/ruby-debug-ide/version.rb

@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.4.24.beta2'
+  IDE_VERSION='0.4.24.beta4'
 end

lib/ruby-debug-ide/xml_printer.rb

@@ -78,7 +78,7 @@ def print_current_frame(frame_pos)
     def print_frame(context, frame_id, current_frame_id)
       # idx + 1: one-based numbering as classic-debugger
       file = context.frame_file(frame_id)
-      print "<frame no=\'%s\' file=\'%s\' line=\'%s\' #{"current='true' " if frame_id == current_frame_id}/>",
+      print "<frame no=\"%s\" file=\"%s\" line=\"%s\" #{"current='true' " if frame_id == current_frame_id}/>",
         frame_id + 1, File.expand_path(file), context.frame_line(frame_id)
     end
 
@@ -173,9 +173,9 @@ def print_variable(name, value, kind)
       value_str = handle_binary_data(value_str)
       escaped_value_str = CGI.escapeHTML(value_str)
       print("<variable name=\"%s\" %s kind=\"%s\" value=\"%s\" type=\"%s\" hasChildren=\"%s\" objectId=\"%#+x\">",
-          CGI.escapeHTML(name), build_compact_value_attr(value), kind, escaped_value_str, value.class,
+          CGI.escapeHTML(name), build_compact_value_attr(value), kind, build_value_attr(escaped_value_str), value.class,
           has_children, value.respond_to?(:object_id) ? value.object_id : value.id)
-      print("<value><![CDATA[%s]]></value>", escaped_value_str)
+      print("<value><![CDATA[%s]]></value>", escaped_value_str) if Debugger.rm_protocol_extensions
       print('</variable>')
     end
 
@@ -345,6 +345,9 @@ def build_compact_name(value)
       return compact_array_str(value) if value.is_a?(Array)
       return compact_hash_str(value) if value.is_a?(Hash)
       nil
+    rescue ::Exception => e
+      print_debug(e)
+      nil
     end
 
     def compact_array_str(value)
@@ -367,6 +370,10 @@ def build_compact_value_attr(value)
       compact_value_str.nil? ? '' : "compactValue=\"#{CGI.escapeHTML(compact_value_str)}\""
     end
 
+    def build_value_attr(escaped_value_str)
+      Debugger.rm_protocol_extensions ? '' : escaped_value_str
+    end
+
     instance_methods.each do |m|
       if m.to_s.index('print_') == 0
         protect m