[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2567] trunk/org.rubypeople.rdt.core/src/org/ rubypeople/rdt/core/util/RDocUtil.java

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

Revision: 2567
          http://svn.sourceforge.net/rubyeclipse/?rev=2567&view=rev
Author:   cawilliams
Date:     2007-05-31 06:37:17 -0700 (Thu, 31 May 2007)

Log Message:
-----------
for variables check for following comment, then check for preceding

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/util/RDocUtil.java

Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/util/RDocUtil.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/util/RDocUtil.java	2007-05-31 13:36:53 UTC (rev 2566)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/util/RDocUtil.java	2007-05-31 13:37:17 UTC (rev 2567)
@@ -47,9 +47,16 @@
 		RubyParser parser = new RubyParser();		
 		parser.parse(src); // parse so we can grab the comment nodes
 		Collection<CommentNode> comments = parser.getComments();		
-		if (member.isType(IRubyElement.TYPE) || member.isType(IRubyElement.METHOD) || member.isType(IRubyElement.CONSTANT)) {
+		if (member.isType(IRubyElement.TYPE) || member.isType(IRubyElement.METHOD)) {
 			return getPrecedingComment(comments, elementOffset, src);
 		}
+		// for variables try to get the following comment, if it's null grab the leading/preceding comment
+		if (member.isType(IRubyElement.CLASS_VAR) || member.isType(IRubyElement.INSTANCE_VAR) || 
+				member.isType(IRubyElement.LOCAL_VARIABLE) || member.isType(IRubyElement.CONSTANT)) {
+			String comment = getFollowingComment(comments, elementOffset, src);
+			if (comment != null) return comment;
+			return getPrecedingComment(comments, elementOffset, src);
+		}
 		return getFollowingComment(comments, elementOffset, src);
 	}
 	


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