[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2566] trunk/org.rubypeople.rdt.core/src/org/ rubypeople/rdt/internal/codeassist/SelectionEngine.java

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

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

Log Message:
-----------
if we hit a class variable declaration just use RubyScript.getElementAt to grab equivalent from RubyModel

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/SelectionEngine.java

Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/SelectionEngine.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/SelectionEngine.java	2007-05-31 13:36:24 UTC (rev 2565)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/SelectionEngine.java	2007-05-31 13:36:53 UTC (rev 2566)
@@ -118,8 +118,9 @@
 			return possible.toArray(new IRubyElement[possible.size()]);
 		}
 		// We're already on the declaration, just return it
-		if ((selected instanceof DefnNode) || (selected instanceof DefsNode) 
-				|| (selected instanceof ConstDeclNode) || (selected instanceof ClassNode) || (selected instanceof ModuleNode)) {
+		if ((selected instanceof DefnNode) || (selected instanceof DefsNode) ||
+				(selected instanceof ConstDeclNode) || (selected instanceof ClassNode) || 
+				(selected instanceof ModuleNode) || (selected instanceof ClassVarDeclNode)) {
 			IRubyElement element = ((RubyScript)script).getElementAt(start);
 			return new IRubyElement[] {element};
 		}
@@ -315,7 +316,7 @@
 	}
 
 	private boolean isClassVarRef(Node node) {
-		return ((node instanceof ClassVarAsgnNode) || (node instanceof ClassVarNode)|| (node instanceof ClassVarDeclNode));
+		return ((node instanceof ClassVarAsgnNode) || (node instanceof ClassVarNode));
 	}
 
 	private boolean isLocalVarRef(Node node) {


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