Merge pull request #47 from valich/master

adding 'more' command; raising version to beta2

Author: denofevil

lib/ruby-debug-ide/commands/expression_info.rb

@@ -0,0 +1,65 @@
+require 'stringio'
+require 'irb/ruby-lex'
+
+module Debugger
+
+  class ExpressionInfoCommand < Command
+    def regexp
+      /^\s*ex(?:pression_info)?\s+/
+    end
+
+    def execute
+      string_to_parse = @match.post_match.gsub("\\n", "\n") + "\n\n\n"
+      total_lines = string_to_parse.count("\n") + 1
+
+      lexer = RubyLex.new
+      io = StringIO.new(string_to_parse)
+      # for passing to the lexer
+      io.instance_exec(string_to_parse.encoding) do |string_encoding|
+        @my_encoding = string_encoding
+        def self.encoding
+          @my_encoding
+        end
+      end
+
+      lexer.set_input(io)
+
+      last_statement = ''
+      last_prompt = ''
+      last_indent = 0
+      lexer.set_prompt do |ltype, indent, continue, lineno|
+        next if (lineno >= total_lines)
+
+        last_prompt = ltype || ''
+        last_indent = indent
+      end
+
+      lexer.each_top_level_statement do |line, line_no|
+        last_statement = line
+      end
+
+      incomplete = true
+      if /\A\s*\Z/m =~ last_statement[0]
+        incomplete = false
+      end
+
+      @printer.print_expression_info(incomplete, last_prompt, last_indent)
+    end
+
+    class << self
+      def help_command
+        "expression_info"
+      end
+
+      def help(cmd)
+        %{
+          ex[pression_info] <expression>\t
+          returns parser-related information for the expression given\t\t
+          'incomplete'=true|false\tindicates whether expression is a complete ruby
+          expression and can be evaluated without getting syntax errors
+        }
+      end
+    end
+  end
+
+end

lib/ruby-debug-ide/commands/inspect.rb

@@ -22,4 +22,4 @@ def execute
     end
   end
 
-end
+end

lib/ruby-debug-ide/version.rb

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

lib/ruby-debug-ide/xml_printer.rb

@@ -220,6 +220,11 @@ def print_expressions(exps)
     def print_expression(exp, value, idx)
       print "<dispay name=\"%s\" value=\"%s\" no=\"%d\" />", exp, value, idx
     end
+
+    def print_expression_info(incomplete, prompt, indent)
+      print "<expressionInfo incomplete=\"%s\" prompt=\"%s\" indent=\"%s\"></expressionInfo>",
+        incomplete, CGI.escapeHTML(prompt), indent
+    end
 
     def print_eval(exp, value)
       print "<eval expression=\"%s\" value=\"%s\" />",  CGI.escapeHTML(exp), value