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

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

Revision: 1605
          http://svn.sourceforge.net/rubyeclipse/?rev=1605&view=rev
Author:   cawilliams
Date:     2006-09-02 13:56:55 -0700 (Sat, 02 Sep 2006)

Log Message:
-----------
remove unused method and import, add hack code to temporarily fix syntax error before passing to parser, remove debug output

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyCompletionProcessor.java

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyCompletionProcessor.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyCompletionProcessor.java	2006-09-02 20:55:40 UTC (rev 1604)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyCompletionProcessor.java	2006-09-02 20:56:55 UTC (rev 1605)
@@ -42,25 +42,21 @@
 import org.jruby.ast.Node;
 import org.jruby.ast.ScopeNode;
 import org.jruby.lexer.yacc.SyntaxException;
-import org.jruby.parser.RubyParserPool;
 import org.rubypeople.rdt.core.IParent;
 import org.rubypeople.rdt.core.IRubyElement;
 import org.rubypeople.rdt.core.IRubyProject;
 import org.rubypeople.rdt.core.IRubyScript;
-import org.rubypeople.rdt.core.ISourceReference;
 import org.rubypeople.rdt.core.IType;
 import org.rubypeople.rdt.core.RubyModelException;
 import org.rubypeople.rdt.internal.codeassist.RubyElementRequestor;
 import org.rubypeople.rdt.internal.core.RubyElement;
 import org.rubypeople.rdt.internal.core.RubyScript;
-import org.rubypeople.rdt.internal.core.RubyScriptStructureBuilder;
 import org.rubypeople.rdt.internal.core.RubyType;
 import org.rubypeople.rdt.internal.core.parser.RubyParser;
 import org.rubypeople.rdt.internal.corext.template.ruby.RubyContextType;
 import org.rubypeople.rdt.internal.ti.util.AttributeLocator;
 import org.rubypeople.rdt.internal.ti.util.ClosestSpanningNodeLocator;
 import org.rubypeople.rdt.internal.ti.util.INodeAcceptor;
-import org.rubypeople.rdt.internal.ti.util.MethodDefinitionLocator;
 import org.rubypeople.rdt.internal.ti.util.ScopedNodeLocator;
 import org.rubypeople.rdt.internal.ui.RubyPlugin;
 import org.rubypeople.rdt.internal.ui.RubyPluginImages;
@@ -381,6 +377,18 @@
 				source = script.getSource();
 			}
 			
+			// FIXME Ugly hacking here to handle where we have invalid syntax by invoking after a period
+			StringBuffer sourceBuff = new StringBuffer(source);
+			offset--;
+			char charAtOffset = (char) sourceBuff.charAt(offset);
+			if (charAtOffset == '.') {
+				sourceBuff.deleteCharAt(offset);
+				offset--;
+			}
+			source = sourceBuff.toString();
+			
+			// XXX Combine this code with the code in RubyScript.codeComplete() (into a new CompletionEngine class?)
+			
 			// Get all references projects
 			List<IRubyProject> projects = new ArrayList<IRubyProject>();
 			projects.add(script.getRubyProject());
@@ -422,9 +430,6 @@
 			// Add all globals, classes, and modules
 			for (Iterator iter = projects.iterator(); iter.hasNext();) {
 				IRubyProject nextProject = (IRubyProject)(iter.next());
-				
-				System.out.println("*** Adding globals/classes/modules available in project: " + nextProject.getElementName() );
-				
 				elements.addAll(getElementsOfType( nextProject, new int[] { IRubyElement.GLOBAL }));
 				elements.addAll(addClassesAndModulesInProject( nextProject ));
 			}
@@ -469,18 +474,6 @@
 	}
 
 	/**
-	 * @param script
-	 * @return
-	 */
-	private Collection getElements(IParent element) {
-		return getElementsOfType(element, new int[] { IRubyElement.TYPE,
-				IRubyElement.METHOD, IRubyElement.GLOBAL,
-				IRubyElement.CONSTANT, IRubyElement.CLASS_VAR,
-				IRubyElement.INSTANCE_VAR });
-	}
-	
-	
-	/**
 	 * Gets the memebrs available inside a type node (ModuleNode, ClassNode):
 	 *  - Instance variables
 	 *  - Class variables


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