[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2916] trunk/org.rubypeople.rdt.ui/src/org/ rubypeople/rdt/internal/ui/text/ruby/RubyAutoIndentStrategy.java

[<caw...@us...>]

Revision: 2916
          http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=2916&view=rev
Author:   cawilliams
Date:     2007-08-02 08:33:36 -0700 (Thu, 02 Aug 2007)

Log Message:
-----------


Modified Paths:
--------------
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyAutoIndentStrategy.java

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyAutoIndentStrategy.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyAutoIndentStrategy.java	2007-08-01 18:52:24 UTC (rev 2915)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyAutoIndentStrategy.java	2007-08-02 15:33:36 UTC (rev 2916)
@@ -165,7 +165,7 @@
 
 	private boolean middleOfBlockRightAfterBeginning(String trimmed, String previousLine) {
 		return middleOfIfRightAfterBeginning(trimmed, previousLine) || middleOfBeginRightAfterBeginning(trimmed, previousLine) || elseRightAfterElsif(trimmed, previousLine)
-		|| ensureRightAfterRescue(trimmed, previousLine) || whenAfterCase(trimmed, previousLine);
+		|| ensureRightAfterRescue(trimmed, previousLine) || whenAfterCase(trimmed, previousLine) || elsifRightAfterElsif(trimmed, previousLine);
 	}
 
 	private boolean middleOfBeginRightAfterBeginning(String trimmed, String previousLine) {
@@ -184,6 +184,10 @@
 		return previousLine.startsWith("elsif ") && trimmed.equals("else");
 	}
 	
+	private boolean elsifRightAfterElsif(String trimmed, String previousLine) {
+		return previousLine.startsWith("elsif ") && trimmed.startsWith("elsif ");
+	}
+	
 	private boolean whenAfterCase(String trimmed, String previousLine) {
 		return previousLine.startsWith("case ") && trimmed.startsWith("when ");
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.