Passing string value of a variable as text of sub-element

To be able to pass \n and other characters which can not be passed inside attribute.
See http://youtrack.jetbrains.com/issue/RUBY-13641 for details.

Author: Oleg Sukhodolsky

lib/ruby-debug-ide/xml_printer.rb

@@ -170,9 +170,11 @@ def print_variable(name, value, kind)
         end 
       end
       value_str = "[Binary Data]" if (value_str.respond_to?('is_binary_data?') && value_str.is_binary_data?)
-      print("<variable name=\"%s\" kind=\"%s\" value=\"%s\" type=\"%s\" hasChildren=\"%s\" objectId=\"%#+x\"/>",
+      print("<variable name=\"%s\" kind=\"%s\" value=\"%s\" type=\"%s\" hasChildren=\"%s\" objectId=\"%#+x\">",
           CGI.escapeHTML(name), kind, CGI.escapeHTML(value_str), value.class,
           has_children, value.respond_to?(:object_id) ? value.object_id : value.id)
+      print("<value><![CDATA[%s]]></value>", value_str)
+      print('</variable>')
     end
 
     def print_breakpoints(breakpoints)

test-base/readers.rb

@@ -114,7 +114,7 @@ def read_start_element(expected_element)
 
     def read_text
       event = @parser.pull
-      fail("expected \":text\" event, but got \"#{event.inspect}\"") unless event.text?
+      fail("expected \":text\" event, but got \"#{event.inspect}\"") unless event.text? || event.cdata?
       event[0]
     end
 
@@ -234,10 +234,25 @@ def read
         case event.event_type
         when :start_element
           check_event(:start_element, 'variable', event)
-          ensure_end_element('variable')
+          value_event = @parser.pull
+          if value_event.event_type == :start_element
+            check_event(:start_element, 'value', value_event)
+            text_value = read_text
+            ensure_end_element('value')
+            ensure_end_element('variable')
+          else
+            text_value = event[1]['value']
+            check_event(:end_element, 'variable', value_event)
+          end
           variables << Variable.new(*Variable.members.map { |m|
             value = event[1][m.to_s]
-            m.to_s == 'hasChildren' ? value == "true" : value
+            if m.to_s == 'hasChildren'
+              value == 'true'
+            elsif m.to_s == 'value'
+              text_value
+            else
+              value
+            end
           })
         when :end_element
           check_event(:end_element, 'variables', event)

test-base/variables_test.rb

@@ -25,7 +25,7 @@ def test_variable_with_xml_content
       {:name => "stringA"},
       {:name => "testHashValue"})
     # will receive ''
-    assert_xml("<start test=\"&\"/>", variables[0].value)
+    assert_equal("<start test=\"&\"/>", variables[0].value)
     assert_local(variables[0])
     # the testHashValue contains an example, where the name consists of special
     # characters