* lisp/progmodes/ruby-mode.el: First cut at SMIE support.

(ruby-use-smie): New var.
(ruby-smie-grammar): New constant.
(ruby-smie--bosp, ruby-smie--implicit-semi-p)
(ruby-smie--forward-token, ruby-smie--backward-token)
(ruby-smie-rules): New functions.
(ruby-mode-variables): Setup SMIE if applicable.
* test/indent/ruby.rb: Fix indentation after =; add more cases.

2 files changed, 39 insertions, 1 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 48d499a9fa4..c11d5d26c13 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * indent/ruby.rb: Fix indentation after =; add more cases.
+
 2013-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * indent/pascal.pas: Add test for mis-identified comments.
diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index 4f2e9e63377..90c6dcdc65c 100644
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -10,7 +10,7 @@ d = %(hello (nested) world)
 
 # Or inside comments.
 x = # "tot %q/to"; =
-y = 2 / 3
+  y = 2 / 3
 
 # Regexp after whitelisted method.
 "abc".sub /b/, 'd'
@@ -21,6 +21,40 @@ a = asub / aslb + bsub / bslb;
 # Highlight the regexp after "if".
 x = toto / foo if /do bar/ =~ "dobar"
 
+def test1(arg)
+  puts "hello"
+end
+
+def test2 (arg)
+  a = "apple"
+
+  if a == 2
+    puts "hello"
+  else
+    puts "there"
+  end
+
+  if a == 2 then
+    puts "hello"
+  elsif a == 3
+    puts "hello3"
+  elsif a == 3 then
+    puts "hello3"
+  else
+    puts "there"
+  end
+
+  case a
+  when "a"
+    6
+  # when "b" :
+  #   7
+  # when "c" : 2
+  when "d"  then 4
+  else 5
+  end
+end
+
 # Some Cucumber code:
 Given /toto/ do
   print "hello"