Skip to content

Commit

Permalink
Include methods from superclasses in autocomplete
Browse files Browse the repository at this point in the history
  • Loading branch information
@erwan
erwan committed May 25, 2010
1 parent 41c072d commit ce7f53c
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 39 deletions.
39 changes: 23 additions & 16 deletions source/src/org/playframework/playclipse/ModelInspector.java
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.ITypeHierarchy;
import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.JavaModelException;


public class ModelInspector { public class ModelInspector {
Expand All @@ -15,9 +16,6 @@ public ModelInspector(IJavaProject javaProject) {
} }


public IMethod resolveAction(String input) { public IMethod resolveAction(String input) {
if (input.contains("@@{")) input = input.substring(input.indexOf("@@{") + 3);
if (input.contains("@{")) input = input.substring(input.indexOf("@{") + 2);

if (input.indexOf('.') == -1) if (input.indexOf('.') == -1)
return null; return null;


Expand All @@ -34,24 +32,33 @@ private IMethod getAction(String fullClassName, String query) {
if (parent == null) { if (parent == null) {
return null; return null;
} }
return findMethod(parent, query); try {
IMethod method = findMethod(parent, query);
if (method != null) return method;
ITypeHierarchy hierarchy = parent.newTypeHierarchy(null);
for (IType superclass: hierarchy.getAllSuperclasses(parent)) {
method = findMethod(superclass, query);
if (method != null) return method;
}
} catch (JavaModelException e) {
e.printStackTrace();
return null;
}
return null;
} }


private IMethod findMethod(IType type, String query) { private IMethod findMethod(IType type, String query) throws JavaModelException {
// We can't use IType.getMethod(name, parameterTypeSignature) because we usually don't know the parameters, // We can't use IType.getMethod(name, parameterTypeSignature) because we usually don't know the parameters,
// we only have the name. // we only have the name.
try {
for (IMethod method: type.getMethods()) { for (IMethod method: type.getMethods()) {
int flags = method.getFlags(); int flags = method.getFlags();
if (Flags.isPublic(flags) if (Flags.isPublic(flags)
&& Flags.isStatic(flags) && Flags.isStatic(flags)
&& method.getReturnType().equals("V")) { && method.getReturnType().equals("V")) {
if (method.getElementName().equals(query)) if (method.getElementName().equals(query))
return method; return method;
}
} }
} catch (JavaModelException e) {
return null;
} }
return null; return null;
} }
Expand Down
71 changes: 48 additions & 23 deletions source/src/org/playframework/playclipse/editors/ActionCompletionProcessor.java
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.TreeSet;


import org.eclipse.jdt.core.Flags; import org.eclipse.jdt.core.Flags;
import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.ICompilationUnit;
Expand All @@ -13,6 +15,8 @@
import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.IParent; import org.eclipse.jdt.core.IParent;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.ITypeHierarchy;
import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.ISourceViewer;
Expand Down Expand Up @@ -54,10 +58,10 @@ public Template[] getTemplates(String contextTypeId) {
// Packages (that may include controllers) // Packages (that may include controllers)
try { try {
IPackageFragmentRoot[] roots = javaProject.getPackageFragmentRoots(); IPackageFragmentRoot[] roots = javaProject.getPackageFragmentRoots();
for (int i = 0; i < roots.length; i++) { for (IPackageFragmentRoot root: roots) {
if (!roots[i].isArchive() && if (!root.isArchive() &&
(ctx.isEmpty() || roots[i].getElementName().startsWith(ctx))) (ctx.isEmpty() || root.getElementName().startsWith(ctx)))
result.add(getTemplate(contextTypeId, roots[i])); result.add(getTemplate(contextTypeId, root));
} }
} catch (JavaModelException e) { } catch (JavaModelException e) {
e.printStackTrace(); e.printStackTrace();
Expand Down Expand Up @@ -103,31 +107,18 @@ private List<Template> getMatchingTemplates(String fullClassName, String query,
IParent parent; IParent parent;
// Look for classes // Look for classes
parent = javaProject.findType(fullClassName); parent = javaProject.findType(fullClassName);
// Look for package fragments if (parent != null) {
if (parent == null) { return getAllMethodsTemplates((IType)parent, query, contextTypeId);
parent = getPackageFragment(javaProject, fullClassName);
} }
// Look for package fragments
parent = getPackageFragment(javaProject, fullClassName);
if (parent == null) { if (parent == null) {
System.out.println("Can't find anything!");
return result; return result;
} }
IJavaElement[] children = parent.getChildren(); for (IJavaElement child: parent.getChildren()) {
for (int i = 0; i < children.length; i++) { if (child instanceof IPackageFragment) {
IJavaElement child = children[i];
System.out.println(child.getElementName() + "?");
if (child instanceof IMethod) {
IMethod method = (IMethod)child;
int flags = method.getFlags();
if ((query.isEmpty() || method.getElementName().startsWith(query))
&& Flags.isPublic(flags)
&& Flags.isStatic(flags)
&& method.getReturnType().equals("V")) {
result.add(getTemplate(contextTypeId, method));
}
} else if (child instanceof IPackageFragment) {
result.add(getTemplate(contextTypeId, (IPackageFragment)child)); result.add(getTemplate(contextTypeId, (IPackageFragment)child));
} else if (child instanceof ICompilationUnit) { // Java class } else if (child instanceof ICompilationUnit) { // Java class
System.out.println(child.getElementName() + " is a ICompilationUnit");
result.add(getTemplate(contextTypeId, (ICompilationUnit)child)); result.add(getTemplate(contextTypeId, (ICompilationUnit)child));
} }
} }
Expand All @@ -138,6 +129,40 @@ private List<Template> getMatchingTemplates(String fullClassName, String query,
return result; return result;
} }


private List<Template> getAllMethodsTemplates(IType type, String query, String contextTypeId) throws JavaModelException {
List<Template> result = new ArrayList<Template>();
Set<String> seen = new TreeSet<String>(); // Used to dedup overridden methods
for (Template template: getMethodsTemplates(type, query, contextTypeId)) {
result.add(template);
seen.add(template.getName());
}
ITypeHierarchy hierarchy = type.newTypeHierarchy(null);
for (IType superclass: hierarchy.getAllSuperclasses(type)) {
for (Template template: getMethodsTemplates(superclass, query, contextTypeId)) {
if (!seen.contains(template.getName())) {
result.add(template);
seen.add(template.getName());
}
}
}
return result;
}

private List<Template> getMethodsTemplates(IType type, String query, String contextTypeId) throws JavaModelException {
List<Template> result = new ArrayList<Template>();

for (IMethod method: type.getMethods()) {
int flags = method.getFlags();
if (Flags.isPublic(flags)
&& Flags.isStatic(flags)
&& method.getReturnType().equals("V")) {
if (query.equals("") || method.getElementName().startsWith(query))
result.add(getTemplate(contextTypeId, method));
}
}
return result;
}

private IPackageFragment getPackageFragment(IJavaProject project, String fragmentName) { private IPackageFragment getPackageFragment(IJavaProject project, String fragmentName) {
IPackageFragment[] frags; IPackageFragment[] frags;
try { try {
Expand Down

0 comments on commit ce7f53c

Please sign in to comment.