Skip to content

GROOVY-7702: @CompileStatic and the method with(Closure) seem to dete… #227

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

Closed
shils wants to merge 1 commit into from
Closed

GROOVY-7702: @CompileStatic and the method with(Closure) seem to dete… #227

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
2 changes: 1 addition & 1 deletion src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,7 @@ protected boolean existsProperty(final PropertyExpression pexp, final boolean re
if (storeProperty(propertyNode, pexp, current, visitor, receiver.getData())) return true;

boolean isThisExpression = objectExpression instanceof VariableExpression &&
((VariableExpression) objectExpression).isThisExpression();
((VariableExpression) objectExpression).isThisExpression() && objectExpressionType.equals(current);
if (storeField(field, isThisExpression, pexp, receiver.getType(), visitor, receiver.getData()))
return true;

Expand Down
10 changes: 9 additions & 1 deletion src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ class FooWorker {
}
}

new FooWorker().doSomething()''', 'Incompatible generic argument types. Cannot assign java.util.ArrayList <Integer> to: java.util.List <String>'
new FooWorker().doSomething()''', 'Cannot assign value of type java.util.ArrayList <Integer> to variable of type java.util.List <String>'
}

void testAICAsStaticProperty() {
Expand Down Expand Up @@ -731,6 +731,14 @@ import org.codehaus.groovy.ast.stmt.AssertStatement
'''
}

void testImplicitPropertyOfDelegateShouldNotPreferField() {
assertScript '''
Calendar.instance.with {
Date d1 = time
}
'''
}

public static interface InterfaceWithField {
String boo = "I don't fancy fields in interfaces"
}
Expand Down