Merge pull request #65 from ruby-debug/performance-improvements

Performance improvements

Author: os97673

lib/ruby-debug-ide/version.rb

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

lib/ruby-debug-ide/xml_printer.rb

@@ -171,31 +171,14 @@ def print_variable(name, value, kind)
         end
       end
       value_str = handle_binary_data(value_str)
-      compact_value_str = build_compact_name(value_str, value)
-      print("<variable name=\"%s\" compactValue=\"%s\" kind=\"%s\" value=\"%s\" type=\"%s\" hasChildren=\"%s\" objectId=\"%#+x\">",
-          CGI.escapeHTML(name), CGI.escapeHTML(compact_value_str), kind, CGI.escapeHTML(value_str), value.class,
+      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,
           has_children, value.respond_to?(:object_id) ? value.object_id : value.id)
-      print("<value><![CDATA[%s]]></value>", CGI.escapeHTML(value_str))
+      print("<value><![CDATA[%s]]></value>", escaped_value_str)
       print('</variable>')
     end
 
-    def build_compact_name(value_str, value)
-      compact = value_str
-      if value.is_a?(Array)
-        slice = value[0..10]
-        compact = slice.inspect
-        if value.size != slice.size
-          compact = compact[0..compact.size-2] + ", ...]"
-        end
-      end
-      if value.is_a?(Hash)
-        slice = value.sort_by { |k, _| k.to_s }[0..5]
-        compact = slice.map {|kv| "#{kv[0]}: #{handle_binary_data(kv[1])}"}.join(", ")
-        compact = "{" + compact + (slice.size != value.size ? ", ..." : "") + "}"
-      end
-      compact
-    end
-    
     def print_breakpoints(breakpoints)
       print_element 'breakpoints' do
         breakpoints.sort_by{|b| b.id }.each do |b|
@@ -298,7 +281,7 @@ def print_trace(context, file, line)
     end
 
     def print_at_line(context, file, line)
-      print "<suspended file=\'%s\' line=\'%s\' threadId=\'%d\' frames=\'%d\'/>",
+      print "<suspended file=\"%s\" line=\"%s\" threadId=\"%d\" frames=\"%d\"/>",
         File.expand_path(file), line, context.thnum, context.stack_size
     end
 
@@ -344,6 +327,7 @@ def print(*params)
     end
 
     def handle_binary_data(value)
+      # noinspection RubyResolve
       return '[Binary Data]' if (value.respond_to?('is_binary_data?') && value.is_binary_data?)
       return '[Invalid encoding]' if (value.respond_to?('valid_encoding?') && !value.valid_encoding?)
       value
@@ -357,6 +341,32 @@ def current_thread_attr(context)
       end
     end
 
+    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
+    end
+
+    def compact_array_str(value)
+      slice   = value[0..10]
+      compact = slice.inspect
+      if value.size != slice.size
+        compact[0..compact.size-2] + ", ...]"
+      end
+      compact
+    end
+
+    def compact_hash_str(value)
+      slice   = value.sort_by { |k, _| k.to_s }[0..5]
+      compact = slice.map { |kv| "#{kv[0]}: #{handle_binary_data(kv[1])}" }.join(", ")
+      "{" + compact + (slice.size != value.size ? ", ..." : "") + "}"
+    end
+
+    def build_compact_value_attr(value)
+      compact_value_str  = build_compact_name(value)
+      compact_value_str.nil? ? '' : "compactValue=\"#{CGI.escapeHTML(compact_value_str)}\""
+    end
+
     instance_methods.each do |m|
       if m.to_s.index('print_') == 0
         protect m