ripl-auto_indent 0.1.1 → 0.1.2

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 0.1.2
+* Fix for modifier statements
+
 == 0.1.1
 * Be compatible with multi_line 0.2.0
 

data/README.rdoc

@@ -19,7 +19,7 @@ You can change the default two spaces used for indention (per level) with <tt>Ri
 
 == Known bugs
 
-* Statement modifiers (if at the end of the line) get displayed incorrectly
+* Not 100% correct ;)
 * Long lines might cause wrong rewriting (if activated)
 
 J-_-L

data/lib/ripl/auto_indent.rb

@@ -1,11 +1,11 @@
 require 'ripl'
 require 'ripl/multi_line'
 require 'coderay'
-#require 'open3'
+require 'set'
 
 module Ripl
   module AutoIndent
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
     TPUT = {
       :sc   => `tput sc`,   # save current cursor position
       :cuu1 => `tput cuu1`, # move cursor on line upwards
@@ -18,28 +18,26 @@ module Ripl
     end
 
     def get_indent(buffer)
-      #syntax_ok = proc{ |code|
-      #  Open3.popen3('ruby -c'){ |sin, sout, _|
-      #    sin << code
-      #    sin.close
-      #    sout.read.chomp
-      #  } == "Syntax OK"
-      #}
+      opening_and_modifier_tokens = %w[if unless until while].to_set
+      opening_tokens              = %w[begin case class def for module do {].to_set
+      closing_tokens              = %w[end }].to_set
+      separator                   = [';', :operator]
+      indent                      = 0
 
-      opening_tokens = %w[begin case class def for if module unless until while do {]
-      closing_tokens = %w[end }]
-      indent = 0
       # parse each token
-      buffer_tokens = CodeRay.scan(buffer, :ruby)
-      buffer_tokens.each{ |token, kind|
-        if kind == :reserved || kind == :operator
-          if opening_tokens.include? token
-            # modifiers cause trouble - so guess, if it is intended as one 
-            #  (because the current line has valid syntax)
-            #next if %w[if unless until while].include?(token) && syntax_ok[ line ]
+      buffer_tokens = [separator] + CodeRay.scan(buffer, :ruby).select{|_, kind|
+        kind != :space
+      }
 
+      buffer_tokens.each_cons(2){ |(*old_pair), (token, kind)|
+        if kind == :reserved || kind == :operator
+          # modifiers cause trouble, so
+          #  fix it in 9/10 cases
+          if opening_tokens.include?(token) ||
+             opening_and_modifier_tokens.include?(token) &&
+               ( old_pair == separator || old_pair == ['=', :operator ] )
             indent += 1
-          elsif closing_tokens.include? token
+          elsif closing_tokens.include?(token)
             indent -= 1
           end
         end
@@ -65,7 +63,7 @@ module Ripl
 
     def loop_eval(input)
       last_indent     = @current_indent
-      @current_indent = get_indent(@buffer ? @buffer*"\n" + "\n" + input : input)
+      @current_indent = get_indent( @buffer ? @buffer*";"+";"+input : input )
 
       if config[:auto_indent_rewrite] && @current_indent < last_indent
         rewrite_line last_indent - @current_indent
@@ -79,9 +77,9 @@ end
 Ripl::Shell.send :include, Ripl::AutoIndent
 
 # default config
-Ripl.config[:auto_indent_rewrite] = true
-Ripl.config[:auto_indent_space]   = '  '
+Ripl.config[:auto_indent_rewrite] = true  if  Ripl.config[:auto_indent_rewrite].nil?
+Ripl.config[:auto_indent_space] ||= '  '
 Ripl.config[:multi_line_prompt]   = '|  ' if !Ripl.config[:multi_line_prompt] ||
-                                             Ripl.config[:multi_line_prompt] == '|    '
+                                              Ripl.config[:multi_line_prompt] == '|    '
 
 # J-_-L

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jan Lelis
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-03 00:00:00 +01:00
+date: 2010-12-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency