[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2586] trunk/org.rubypeople.rdt.ui/src/org/ rubypeople/rdt/internal/ui/search/OccurrencesFinder.java

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

Revision: 2586
          http://svn.sourceforge.net/rubyeclipse/?rev=2586&view=rev
Author:   cawilliams
Date:     2007-06-06 09:44:06 -0700 (Wed, 06 Jun 2007)

Log Message:
-----------
handle remembering write usages as well as just normal occurrences

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/OccurrencesFinder.java

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/OccurrencesFinder.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/OccurrencesFinder.java	2007-06-06 16:40:25 UTC (rev 2585)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/OccurrencesFinder.java	2007-06-06 16:44:06 UTC (rev 2586)
@@ -21,6 +21,7 @@
 import org.jruby.ast.ClassVarDeclNode;
 import org.jruby.ast.ClassVarNode;
 import org.jruby.ast.Colon2Node;
+import org.jruby.ast.ConstDeclNode;
 import org.jruby.ast.ConstNode;
 import org.jruby.ast.DAsgnNode;
 import org.jruby.ast.DVarNode;
@@ -278,7 +279,7 @@
 	 * @return
 	 */
 	private boolean isConstRef(Node node) {
-		return (node instanceof ConstNode);
+		return (node instanceof ConstNode) || (node instanceof ConstDeclNode);
 	}
 
 	/**
@@ -339,6 +340,7 @@
 		// Scrape position from pertinent nodes
 		for (Node searchResult : searchResults) {
 			occurrences.add(searchResult);
+			if (searchResult instanceof LocalAsgnNode) fWriteUsages.add(searchResult);
 		}
 	}
 
@@ -381,6 +383,7 @@
 		// Scrape position from pertinent nodes
 		for (Node searchResult : searchResults) {
 			occurrences.add(searchResult);
+			if (searchResult instanceof DAsgnNode) fWriteUsages.add(searchResult);
 		}
 	}
 
@@ -395,7 +398,7 @@
 		Node searchSpace = determineSearchSpace(root, orig);
 
 		// Finalize searchSpace because Java's scoping rules are the awesome
-		// todo: not needed?
+		// TODO: not needed?
 		// final Node finalSearchSpace = searchSpace;
 
 		// Get name of local variable reference
@@ -415,6 +418,7 @@
 		// Scrape position from pertinent nodes
 		for (Node searchResult : searchResults) {
 			occurrences.add(searchResult);
+			if (searchResult instanceof InstAsgnNode) fWriteUsages.add(searchResult);
 		}
 
 	}
@@ -483,6 +487,7 @@
 		// Scrape position from pertinent nodes
 		for (Node searchResult : searchResults) {
 			occurrences.add(searchResult);
+			if ((searchResult instanceof ClassVarAsgnNode) || (searchResult instanceof ClassVarDeclNode)) fWriteUsages.add(searchResult);
 		}
 
 	}
@@ -508,6 +513,7 @@
 		// Scrape position from pertinent nodes
 		for (Node searchResult : searchResults) {
 			occurrences.add(searchResult);
+			if (searchResult instanceof GlobalAsgnNode) fWriteUsages.add(searchResult);
 		}
 	}
 
@@ -577,6 +583,7 @@
 
 		for (Node searchResult : searchResults) {
 			occurrences.add(searchResult);
+			if (searchResult instanceof ConstDeclNode) fWriteUsages.add(searchResult);
 		}
 	}
 


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