[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [1581] branches/type_inferrence/trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyCompletionProcessor.java

[<jas...@us...>]

Revision: 1581
Author:   jasonpmorrison
Date:     2006-08-21 01:48:54 -0700 (Mon, 21 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/rubyeclipse/?rev=1581&view=rev

Log Message:
-----------
* Ooops - looks like MethodDefinitionLocator got re-appropriated.  Replaced its usage in RubyCompletionProcessor with usage of ScopedNodeLocator.

Modified Paths:
--------------
    branches/type_inferrence/trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyCompletionProcessor.java
Modified: branches/type_inferrence/trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyCompletionProcessor.java
===================================================================
--- branches/type_inferrence/trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyCompletionProcessor.java	2006-08-21 08:41:58 UTC (rev 1580)
+++ branches/type_inferrence/trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyCompletionProcessor.java	2006-08-21 08:48:54 UTC (rev 1581)
@@ -594,7 +594,15 @@
 		}
 		
 		// Get method names defined by DefnNodes and DefsNodes
-		elements.addAll( MethodDefinitionLocator.Instance().findMethodDefinitionsInScope(typeNode) );
+		List<Node> methodDefinitions = ScopedNodeLocator.Instance().findNodesInScope(typeNode, new INodeAcceptor() {
+			public boolean doesAccept(Node node) {
+				return ( node instanceof DefnNode ) || ( node instanceof DefsNode );
+			}
+		});
+		for ( Node methodDefinition : methodDefinitions ) {
+			if ( methodDefinition instanceof DefnNode ) { elements.add( ((DefnNode)methodDefinition).getName() ); }
+			if ( methodDefinition instanceof DefsNode ) { elements.add( ((DefsNode)methodDefinition).getName() ); }
+		}
 		
 		// Get instance and class vars defined by [c]attr_* calls
 		elements.addAll( AttributeLocator.Instance().findInstanceAttributesInScope(typeNode) );


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