Skip to content

Commit

Permalink
Improve inferencing of constructor calls incl. this and super calls
Browse files Browse the repository at this point in the history
  • Loading branch information
@eric-milles
eric-milles committed Jan 22, 2017
1 parent 7b5800b commit 1a409af
Show file tree
Hide file tree
Showing 5 changed files with 306 additions and 262 deletions.
60 changes: 19 additions & 41 deletions ...e.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/AbstractInferencingTest.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2016 the original author or authors.
* Copyright 2009-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,11 +15,10 @@
*/
package org.eclipse.jdt.core.groovy.tests.search;

import groovyjarjarasm.asm.Opcodes;

import java.util.ArrayList;
import java.util.List;

import groovyjarjarasm.asm.Opcodes;
import org.codehaus.groovy.ast.ASTNode;
import org.codehaus.groovy.ast.AnnotatedNode;
import org.codehaus.groovy.ast.ClassHelper;
Expand All @@ -38,10 +37,6 @@
import org.eclipse.jdt.groovy.search.TypeLookupResult.TypeConfidence;
import org.eclipse.jdt.groovy.search.VariableScope;

/**
* @author Andrew Eisenberg
* @created Nov 13, 2009
*/
public abstract class AbstractInferencingTest extends AbstractGroovySearchTest {

public AbstractInferencingTest(String name) {
Expand All @@ -52,13 +47,11 @@ protected void assertType(String contents, String expectedType) {
assertType(contents, 0, contents.length(), expectedType, false);
}

protected void assertType(String contents, int exprStart, int exprEnd,
String expectedType) {
protected void assertType(String contents, int exprStart, int exprEnd, String expectedType) {
assertType(contents, exprStart, exprEnd, expectedType, false);
}

protected void assertTypeOneOf(String contents, int start, int end,
String... expectedTypes) throws Throwable {
protected void assertTypeOneOf(String contents, int start, int end, String... expectedTypes) throws Throwable {
boolean ok = false;
Throwable error = null;
for (int i = 0; !ok && i < expectedTypes.length; i++) {
Expand Down Expand Up @@ -89,14 +82,12 @@ protected void assertType(String contents, String expectedType, boolean forceWor
protected void assertType(String contents, int exprStart, int exprEnd, String expectedType, boolean forceWorkingCopy) {
assertType(contents, exprStart, exprEnd, expectedType, null, forceWorkingCopy);
}
public static void assertType(GroovyCompilationUnit contents, int exprStart,
int exprEnd, String expectedType, boolean forceWorkingCopy) {

public static void assertType(GroovyCompilationUnit contents, int exprStart, int exprEnd, String expectedType, boolean forceWorkingCopy) {
assertType(contents, exprStart, exprEnd, expectedType, null, forceWorkingCopy);
}

public static void assertType(GroovyCompilationUnit unit,
int exprStart, int exprEnd, String expectedType, String extraDocSnippet,
boolean forceWorkingCopy) {
public static void assertType(GroovyCompilationUnit unit, int exprStart, int exprEnd, String expectedType, String extraDocSnippet, boolean forceWorkingCopy) {
SearchRequestor requestor = doVisit(exprStart, exprEnd, unit, forceWorkingCopy);

assertNotNull("Did not find expected ASTNode", requestor.node);
Expand Down Expand Up @@ -131,8 +122,7 @@ public static void assertType(GroovyCompilationUnit unit,
* @param assumeNoUnknowns
* @return null if all is OK, or else returns an error message specifying the problem
*/
public static String checkType(GroovyCompilationUnit unit, int exprStart,
int exprEnd, String expectedType, String expectedDeclaringType, boolean assumeNoUnknowns, boolean forceWorkingCopy) {
public static String checkType(GroovyCompilationUnit unit, int exprStart, int exprEnd, String expectedType, String expectedDeclaringType, boolean assumeNoUnknowns, boolean forceWorkingCopy) {
SearchRequestor requestor = doVisit(exprStart, exprEnd, unit, forceWorkingCopy);
if (requestor.node == null) {
return "Did not find expected ASTNode. (Start:" + exprStart + ", End:" + exprEnd + ")\n" +
Expand Down Expand Up @@ -178,8 +168,7 @@ public static String checkType(GroovyCompilationUnit unit, int exprStart,
return null;
}

protected void assertType(String contents, int exprStart, int exprEnd,
String expectedType, String extraDocSnippet, boolean forceWorkingCopy) {
protected void assertType(String contents, int exprStart, int exprEnd, String expectedType, String extraDocSnippet, boolean forceWorkingCopy) {
GroovyCompilationUnit unit = createUnit("Search", contents);
assertType(unit, exprStart, exprEnd, expectedType, extraDocSnippet, forceWorkingCopy);
}
Expand Down Expand Up @@ -236,50 +225,41 @@ public static SearchRequestor doVisit(int exprStart, int exprEnd, GroovyCompilat
}
}

protected void assertDeclaringType(String contents, int exprStart, int exprEnd,
String expectedDeclaringType) {
protected void assertDeclaringType(String contents, int exprStart, int exprEnd, String expectedDeclaringType) {
assertDeclaringType(contents, exprStart, exprEnd, expectedDeclaringType, false);
}

protected enum DeclarationKind { FIELD, METHOD, PROPERTY, CLASS }

protected void assertDeclaration(String contents, int exprStart, int exprEnd,
String expectedDeclaringType, String declarationName, DeclarationKind kind) {
protected void assertDeclaration(String contents, int exprStart, int exprEnd, String expectedDeclaringType, String declarationName, DeclarationKind kind) {
assertDeclaringType(contents, exprStart, exprEnd, expectedDeclaringType, false, false);
GroovyCompilationUnit unit = createUnit("Search", contents);
SearchRequestor requestor = doVisit(exprStart, exprEnd, unit, false);

switch (kind) {
case FIELD:
assertTrue("Expecting field, but was " + requestor.result.declaration,
requestor.result.declaration instanceof FieldNode);
assertTrue("Expecting field, but was " + requestor.result.declaration, requestor.result.declaration instanceof FieldNode);
assertEquals("Wrong field name", declarationName, ((FieldNode) requestor.result.declaration).getName());
break;
case METHOD:
assertTrue("Expecting method, but was " + requestor.result.declaration,
requestor.result.declaration instanceof MethodNode);
assertTrue("Expecting method, but was " + requestor.result.declaration, requestor.result.declaration instanceof MethodNode);
assertEquals("Wrong method name", declarationName, ((MethodNode) requestor.result.declaration).getName());
break;
case PROPERTY:
assertTrue("Expecting property, but was " + requestor.result.declaration,
requestor.result.declaration instanceof PropertyNode);
assertTrue("Expecting property, but was " + requestor.result.declaration, requestor.result.declaration instanceof PropertyNode);
assertEquals("Wrong property name", declarationName, ((PropertyNode) requestor.result.declaration).getName());
break;
case CLASS:
assertTrue("Expecting class, but was " + requestor.result.declaration,
requestor.result.declaration instanceof ClassNode);
assertTrue("Expecting class, but was " + requestor.result.declaration, requestor.result.declaration instanceof ClassNode);
assertEquals("Wrong class name", declarationName, ((ClassNode) requestor.result.declaration).getName());
}
}

protected void assertDeclaringType(String contents, int exprStart, int exprEnd,
String expectedDeclaringType, boolean forceWorkingCopy) {

protected void assertDeclaringType(String contents, int exprStart, int exprEnd, String expectedDeclaringType, boolean forceWorkingCopy) {
assertDeclaringType(contents, exprStart, exprEnd, expectedDeclaringType, forceWorkingCopy, false);
}

protected void assertDeclaringType(String contents, int exprStart, int exprEnd,
String expectedDeclaringType, boolean forceWorkingCopy, boolean expectingUnknown) {
protected void assertDeclaringType(String contents, int exprStart, int exprEnd, String expectedDeclaringType, boolean forceWorkingCopy, boolean expectingUnknown) {
GroovyCompilationUnit unit = createUnit("Search", contents);
SearchRequestor requestor = doVisit(exprStart, exprEnd, unit, forceWorkingCopy);

Expand Down Expand Up @@ -316,8 +296,7 @@ protected void assertDeclaringType(String contents, int exprStart, int exprEnd,
}
}

protected void assertUnknownConfidence(String contents, int exprStart, int exprEnd,
String expectedDeclaringType, boolean forceWorkingCopy) {
protected void assertUnknownConfidence(String contents, int exprStart, int exprEnd, String expectedDeclaringType, boolean forceWorkingCopy) {
GroovyCompilationUnit unit = createUnit("Search", contents);
SearchRequestor requestor = doVisit(exprStart, exprEnd, unit, forceWorkingCopy);

Expand Down Expand Up @@ -363,7 +342,7 @@ public static String printGenerics(ClassNode type) {
return sb.toString();
}

public class UnknownTypeRequestor implements ITypeRequestor {
public class UnknownTypeRequestor implements ITypeRequestor {
private List<ASTNode> unknownNodes = new ArrayList<ASTNode>();

public List<ASTNode> getUnknownNodes() {
Expand All @@ -390,7 +369,6 @@ public static class SearchRequestor implements ITypeRequestor {
public final List<ASTNode> unknowns = new ArrayList<ASTNode>();

public SearchRequestor(int start, int end) {
super();
this.start = start;
this.end = end;
}
Expand Down

0 comments on commit 1a409af

Please sign in to comment.