Skip to content

Fixes #373 #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2018
Merged

Fixes #373 #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions plugins/com.gwtplugins.gdt.eclipse.core/src/com/google/gdt/eclipse/core/JavaASTUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import org.eclipse.jdt.core.dom.Type;
import org.eclipse.jdt.core.dom.TypeDeclaration;
import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
import org.eclipse.jdt.internal.corext.dom.ASTNodes;
import org.eclipse.jdt.internal.corext.dom.TypeBindingVisitor;
import org.eclipse.jdt.internal.ui.text.correction.ASTResolving;

Expand Down Expand Up @@ -122,6 +123,7 @@ public static boolean containsTypeVariable(Type type) {
final boolean[] containsTypeVariable = {false};

ASTResolving.visitAllBindings(type, new TypeBindingVisitor() {
@Override
public boolean visit(ITypeBinding visitedBinding) {
if (visitedBinding.isTypeVariable()) {
containsTypeVariable[0] = true;
Expand Down Expand Up @@ -262,6 +264,15 @@ public static TypeDeclaration findTypeDeclaration(IJavaProject javaProject,
return null;
}

public static ITypeBinding findTypeBinding(IType currentType) throws JavaModelException{
final ASTParser parser = ASTParser.newParser(AST.JLS8);
parser.setKind(ASTParser.K_COMPILATION_UNIT);
parser.setSource(currentType.getCompilationUnit());
parser.setResolveBindings(true);
CompilationUnit unit = (CompilationUnit) parser.createAST(null);
return ASTNodes.getTypeBinding(unit, currentType);
}

/**
* Identical to
* {@link org.eclipse.jdt.internal.corext.dom.Bindings#findTypeInHierarchy(ITypeBinding, String)}
Expand Down
13 changes: 13 additions & 0 deletions ...tplugins.gwt.eclipse.core/src/com/google/gwt/eclipse/core/uibinder/UiBinderUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@
import org.eclipse.jdt.core.ITypeHierarchy;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.dom.FieldDeclaration;
import org.eclipse.jdt.core.dom.IMethodBinding;
import org.eclipse.jdt.core.dom.ITypeBinding;
import org.eclipse.jdt.core.dom.MethodDeclaration;
import org.eclipse.jdt.core.dom.Modifier;
import org.eclipse.jdt.internal.corext.dom.Bindings;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.Region;

Expand Down Expand Up @@ -409,6 +412,16 @@ public static IType resolveJavaElExpression(IType contextType,
currentType = fragmentType;
continue;
}

// Final attempt to resolve the type, this resolves the binding
// in the case of generics or parameterized types. Fixes issue 373
ITypeBinding binding = JavaASTUtils.findTypeBinding(currentType);
IMethodBinding methodBinding = Bindings.findMethodInHierarchy(binding,
fragment, new ITypeBinding[] {});
if(methodBinding.getReturnType() != null) {
currentType = fragmentType;
continue;
}
}
} catch (JavaModelException e) {
// Ignore, and continue the search
Expand Down