Fix expression_info command failing with new unescaping;

Fix expression_info for ruby 1.8

Author: valich

Diff for: lib/ruby-debug-ide/commands/expression_info.rb

@@ -9,13 +9,20 @@ def regexp
     end
 
     def execute
-      string_to_parse = unescape_incoming(@match.post_match) + "\n\n\n"
+      string_to_parse = Command.unescape_incoming(@match.post_match) + "\n\n\n"
       total_lines = string_to_parse.count("\n") + 1
 
       lexer = RubyLex.new
       io = StringIO.new(string_to_parse)
+
+      begin
+        encoding = string_to_parse.encoding
+      rescue
+        encoding = 'None'
+      end
+
       # for passing to the lexer
-      io.instance_exec(string_to_parse.encoding) do |string_encoding|
+      io.instance_exec(encoding) do |string_encoding|
         @my_encoding = string_encoding
         def self.encoding
           @my_encoding
@@ -39,7 +46,7 @@ def self.encoding
       end
 
       incomplete = true
-      if /\A\s*\Z/m =~ last_statement[0]
+      if /\A\s*\Z/m =~ last_statement
         incomplete = false
       end
 

Diff for: test-base/expression_info_test.rb

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+
+require 'test_base'
+
+module ExpressionInfoTest
+
+  def test_info_multiline_expression
+    create_socket ["sleep 0.1"]
+    run_to_line(1)
+    send_ruby('expression_info 1+')
+    expression_info = read_expression_info
+    assert_equal("true", expression_info.incomplete)
+
+    send_ruby('expression_info 1+\\n1')
+    expression_info = read_expression_info
+    assert_equal("false", expression_info.incomplete)
+
+    send_ruby('expression_info "')
+    expression_info = read_expression_info
+    assert_equal("true", expression_info.incomplete)
+
+    send_ruby('expression_info "\\\\"')
+    expression_info = read_expression_info
+    assert_equal("true", expression_info.incomplete)
+
+    send_ruby('expression_info "\\\\\\n"')
+    expression_info = read_expression_info
+    assert_equal("false", expression_info.incomplete)
+
+    send_ruby('expression_info def my_meth')
+    expression_info = read_expression_info
+    assert_equal("true", expression_info.incomplete)
+    send_cont
+  end
+
+end
+

Diff for: test-base/readers.rb

@@ -19,6 +19,7 @@ module Readers
   RubyThread = Struct.new("RubyThread", :id, :status)
   Frame = Struct.new("Frame", :no, :file, :line)
   Variable = Struct.new("Variable", :name, :kind, :value, :type, :hasChildren, :objectId)
+  ExpressionInfo = Struct.new("ExpressionInfo", :incomplete, :prompt, :indent)
 
   def read_breakpoint_added
     (@breakpoint_added_reader ||= BreakPointAddedReader.new(parser)).read
@@ -88,6 +89,10 @@ def read_processing_exception
     (@processing_exception_reader ||= ProcessingExceptionReader.new(parser)).read
   end
 
+  def read_expression_info
+    (@expression_info_reader ||= ExpressionInfoReader.new(parser)).read
+  end
+
   def parser
     fail '"parser" method must be defined'
   end
@@ -315,4 +320,11 @@ def read
     end
   end
 
+  class ExpressionInfoReader < BaseReader
+    def read
+      data = read_element_data("expressionInfo")
+      ExpressionInfo.new(data['incomplete'], data['prompt'], data['indent'])
+    end
+  end
+
 end

Diff for: test/rd_expression_info_test.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require 'rd_test_base'
+require 'expression_info_test'
+
+class RDExpressionInfoTest < RDTestBase
+
+  include ExpressionInfoTest
+
+end
+