ruby-debug-ide 0.7.0.beta4 → 0.7.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcd16a3be5a13bc73a6ad876ae14ff2fd4fb6ede
-  data.tar.gz: 7d35492d5109313d055b692bf7511faac90f8971
+  metadata.gz: 255f62070c2ea02e2d2e1e973e1b4a688ad5acb5
+  data.tar.gz: bda6489b589198e82ef8c76500d20c98546094cc
 SHA512:
-  metadata.gz: 3bef85fe34f75f9da9ad5bc023209c15736003528dc6e1652c03a63f63c3134f8ef5967ea0cbbefe21698ae9205c0d46d2bf35732fe30f26927bb972254f6c3e
-  data.tar.gz: 6be446a5fe8eb26442aec3856aab0ebe5d458f7d6a9c1de0269bf7315b6d19914bab4ea892bb408d03a39aaf36a7a63ec53454d525c5bf729c934f213edb98b5
+  metadata.gz: dcd0da624f59ba503601743f9a7809e0548ce2eab7c14cb2a80ca60cb4ca41744787eae61aea2069e4f397ffdd6c48386061fd03bb154fcc5bac91444f1ed590
+  data.tar.gz: 060d148ae4a201d233a1c0da8e770e67416626de67225ec48a2a03d4742a351b761d5b6a9c9db215703a9d966d6cb8088ae39b5ee858051ba9bf79a0659ba6bf

data/Gemfile

@@ -13,7 +13,7 @@ end
 gem "ruby-debug-base", :platforms => [:jruby, *mries('18')]
 gem "ruby-debug-base19x", ">= 0.11.32", :platforms => mries('19')
 if RUBY_VERSION && RUBY_VERSION >= "2.0"
-  gem "debase", "~> 0.2.2", :platforms => mries('20', '21', '22', '23', '24', '25')
+  gem "debase", "~> 0.2", ">= 0.2.2", :platforms => mries('20', '21', '22', '23', '24', '25')
 end
 
 gemspec

data/bin/rdebug-ide

@@ -27,7 +27,8 @@ options = OpenStruct.new(
     'catchpoint_deleted_event' => false,
     'value_as_nested_element' => false,
     'attach_mode' => false,
-    'cli_debug' => false
+    'cli_debug' => false,
+    'key_value_mode' => false
 )
 
 opts = OptionParser.new do |opts|
@@ -80,6 +81,9 @@ EOB
   opts.on("--attach-mode", "Tells that rdebug-ide is working in attach mode") do
     options.attach_mode = true
   end
+  opts.on("--key-value", "Key/Value presentation of hash items") do
+    options.key_value_mode = true
+  end
   opts.on("--ignore-port", "Generate another port") do
     options.ignore_port = true
   end
@@ -166,6 +170,7 @@ Debugger.debugger_memory_limit = options.debugger_memory_limit
 Debugger.inspect_time_limit = options.inspect_time_limit
 Debugger.catchpoint_deleted_event = options.catchpoint_deleted_event || options.rm_protocol_extensions
 Debugger.value_as_nested_element = options.value_as_nested_element || options.rm_protocol_extensions
+Debugger.key_value_mode = options.key_value_mode
 
 if options.attach_mode
   if Debugger::FRONT_END == "debase"

data/lib/ruby-debug-ide.rb

@@ -51,6 +51,7 @@ module Debugger
     end
 
     attr_accessor :attached
+    attr_accessor :key_value_mode
     attr_accessor :cli_debug, :xml_debug, :evaluation_timeout
     attr_accessor :trace_to_s, :debugger_memory_limit, :inspect_time_limit
     attr_accessor :control_thread
@@ -119,7 +120,7 @@ module Debugger
           # "localhost" and nil have problems on some systems.
           host ||= '127.0.0.1'
 
-          server = notify_dispatcher_if_needed(host, port, notify_dispatcher) do |real_port, port_changed = false|
+          server = notify_dispatcher_if_needed(host, port, notify_dispatcher) do |real_port, port_changed|
             s = TCPServer.new(host, real_port)
             print_greeting_msg $stderr, host, real_port, port_changed ? "Subprocess" : "Fast" if defined? IDE_VERSION
             s

data/lib/ruby-debug-ide/version.rb

@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.7.0.beta4'
+  IDE_VERSION='0.7.0.beta6'
 end

data/lib/ruby-debug-ide/xml_printer.rb

@@ -144,19 +144,36 @@ module Debugger
       end
     end
 
-    def print_hash(hash)
+    def do_print_hash_key_value(hash)
+      print_element("variables", {:type => 'hashItem'}) do
+        hash.each {|(k, v)|
+          print_variable('key', k, 'instance')
+          print_variable('value', v, 'instance')
+        }
+      end
+    end
+
+    def do_print_hash(hash)
       print_element("variables") do
-        hash.keys.each {|k|
+        hash.each {|(k, v)|
           if k.class.name == "String"
             name = '\'' + k + '\''
           else
             name = exec_with_allocation_control(k, :to_s, OverflowMessageType::EXCEPTION_MESSAGE)
           end
-          print_variable(name, hash[k], 'instance')
+          print_variable(name, v, 'instance')
         }
       end
     end
 
+    def print_hash(hash)
+      if Debugger.key_value_mode
+        do_print_hash_key_value(hash)
+      else
+        do_print_hash(hash)
+      end
+    end
+
     def print_string(string)
       print_element("variables") do
         if string.respond_to?('bytes')
@@ -243,6 +260,7 @@ module Debugger
 
     def print_variable(name, value, kind)
       name = name.to_s
+
       if value.nil?
         print("<variable name=\"%s\" kind=\"%s\"/>", CGI.escapeHTML(name), kind)
         return
@@ -280,6 +298,7 @@ module Debugger
             CGI.escapeHTML(name), build_compact_value_attr(value, value_str), kind,
             build_value_attr(escaped_value_str), value.class,
             has_children, value.object_id)
+
       print("<value><![CDATA[%s]]></value>", escaped_value_str) if Debugger.value_as_nested_element
       print('</variable>')
     rescue StandardError => e
@@ -439,10 +458,13 @@ module Debugger
       end
     end
 
-    def print_element(name)
-      print("<#{name}>")
+    def print_element(name, additional_tags = nil)
+      additional_tags_presentation = additional_tags.nil? ? ''
+                                         : additional_tags.map {|tag, value| " #{tag}=\"#{value}\""}.reduce(:+)
+
+      print("<#{name}#{additional_tags_presentation}>")
       begin
-        yield
+        yield if block_given?
       ensure
         print("</#{name}>")
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta4
+  version: 0.7.0.beta6
 platform: ruby
 authors:
 - Markus Barchfeld, Martin Krauskopf, Mark Moseley, JetBrains RubyMine Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake