[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2702] trunk/org.rubypeople.rdt.ui/src/org/ rubypeople/rdt/internal/ui/text/comment/RubyCommentAutoIndentStrategy.java

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

Revision: 2702
          http://svn.sourceforge.net/rubyeclipse/?rev=2702&view=rev
Author:   cawilliams
Date:     2007-06-29 09:29:48 -0700 (Fri, 29 Jun 2007)

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


Modified Paths:
--------------
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/comment/RubyCommentAutoIndentStrategy.java

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/comment/RubyCommentAutoIndentStrategy.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/comment/RubyCommentAutoIndentStrategy.java	2007-06-29 16:05:43 UTC (rev 2701)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/comment/RubyCommentAutoIndentStrategy.java	2007-06-29 16:29:48 UTC (rev 2702)
@@ -8,12 +8,15 @@
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.Region;
 import org.eclipse.jface.text.TextUtilities;
+import org.eclipse.jface.text.rules.Token;
 import org.eclipse.ui.texteditor.ITextEditor;
+import org.jruby.lexer.yacc.SyntaxException;
 import org.rubypeople.rdt.core.IMethod;
 import org.rubypeople.rdt.core.IRubyElement;
 import org.rubypeople.rdt.core.IRubyProject;
 import org.rubypeople.rdt.core.IRubyScript;
 import org.rubypeople.rdt.core.RubyModelException;
+import org.rubypeople.rdt.internal.core.parser.RubyParser;
 import org.rubypeople.rdt.internal.corext.util.CodeFormatterUtil;
 import org.rubypeople.rdt.internal.ui.RubyPlugin;
 import org.rubypeople.rdt.internal.ui.rubyeditor.WorkingCopyManager;
@@ -76,6 +79,14 @@
 
 		try {
 			int p = (offset == d.getLength() ? offset - 1 : offset);
+			try {
+				new RubyParser().parse(d.get());
+				return;
+			} catch(SyntaxException se) {
+				if (!se.getMessage().equals("embedded document meets end of file")) {
+					return;
+				}
+			}
 				
 			int lineNumber = d.getLineOfOffset(p);
 			IRegion line = d.getLineInformation(lineNumber);


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