Skip to content

Commit

Permalink
Fix for #782: add support for @PackageScope on annotation type
Browse files Browse the repository at this point in the history
  • Loading branch information
eric-milles committed Dec 27, 2018
1 parent 8181b44 commit bfd9996
Show file tree
Hide file tree
Showing 7 changed files with 211 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -270,4 +270,16 @@ public void testPackageScope8() {
method = findMethod(getCUDeclFor("Foo.groovy"), "method4");
assertTrue("Expected protected but was: " + Modifier.toString(method.modifiers), Modifier.isProtected(method.modifiers));
}

@Test // https://issues.apache.org/jira/browse/GROOVY-8940
public void testPackageScope9() {
String[] sources = {
"Tag.groovy",
"@groovy.transform.PackageScope\n" +
"@interface Tag {\n" +
"}\n",
};

runNegativeTest(sources, "");
}
}
1 change: 1 addition & 0 deletions base/org.codehaus.groovy24/.checkstyle
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<file-match-pattern match-pattern="groovy/antlr/parser/GroovyRecognizer.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/antlr/parser/GroovyTokenTypes.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/ast/AnnotatedNode.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/ast/AnnotationNode.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/ast/ASTNode.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/ast/ClassCodeVisitorSupport.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/ast/ClassHelper.java" include-pattern="false" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.codehaus.groovy.ast;

import org.codehaus.groovy.GroovyBugError;
import org.codehaus.groovy.ast.expr.Expression;

import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;

/**
* Represents an annotation which can be attached to interfaces, classes, methods and fields.
*
* @author <a href="mailto:[email protected]">James Strachan</a>
* @author <a href='mailto:the[dot]mindstorm[at]gmail[dot]com'>Alex Popescu</a>
*/
public class AnnotationNode extends ASTNode {
/* GRECLIPSE edit
public static final int TYPE_TARGET = 1;
*/
public static final int CONSTRUCTOR_TARGET = 1 << 1;
public static final int METHOD_TARGET = 1 << 2;
public static final int FIELD_TARGET = 1 << 3;
public static final int PARAMETER_TARGET = 1 << 4;
public static final int LOCAL_VARIABLE_TARGET = 1 << 5;
public static final int ANNOTATION_TARGET = 1 << 6;
public static final int PACKAGE_TARGET = 1 << 7;
// GRECLIPSE add -- GROOVY-7151 and GROOVY-8940
public static final int TYPE_TARGET = 1 | ANNOTATION_TARGET;
// GRECLIPSE end
private static final int ALL_TARGETS = TYPE_TARGET | CONSTRUCTOR_TARGET | METHOD_TARGET
| FIELD_TARGET | PARAMETER_TARGET | LOCAL_VARIABLE_TARGET | PACKAGE_TARGET;

private final ClassNode classNode;
private Map<String, Expression> members;
private boolean runtimeRetention= false, sourceRetention= false, classRetention = false;
private int allowedTargets = ALL_TARGETS;

public AnnotationNode(ClassNode classNode) {
this.classNode = classNode;
}

public ClassNode getClassNode() {
return classNode;
}

public Map<String, Expression> getMembers() {
if (members == null) {
return Collections.emptyMap();
}
return members;
}

public Expression getMember(String name) {
if (members == null) {
return null;
}
return members.get(name);
}

private void assertMembers() {
if (members == null) {
members = new LinkedHashMap<String, Expression>();
}
}

public void addMember(String name, Expression value) {
assertMembers();
Expression oldValue = members.get(name);
if (oldValue == null) {
members.put(name, value);
}
else {
throw new GroovyBugError(String.format("Annotation member %s has already been added", name));
}
}

public void setMember(String name, Expression value) {
assertMembers();
members.put(name, value);
}

public boolean isBuiltIn(){
return false;
}

/**
* Flag corresponding to <code>RetentionPolicy</code>.
* @return <tt>true</tt> if the annotation should be visible at runtime,
* <tt>false</tt> otherwise
*/
public boolean hasRuntimeRetention() {
return this.runtimeRetention;
}

/**
* Sets the internal flag of this annotation runtime retention policy.
* If the current annotation has
* <code>RetentionPolicy.RUNTIME</code> or if <tt>false</tt>
* if the <code>RetentionPolicy.CLASS</code>.
* @param flag if <tt>true</tt> then current annotation is marked as having
* <code>RetentionPolicy.RUNTIME</code>. If <tt>false</tt> then
* the annotation has <code>RetentionPolicy.CLASS</code>.
*/
public void setRuntimeRetention(boolean flag) {
this.runtimeRetention = flag;
}

/**
* Flag corresponding to <code>RetentionPolicy.SOURCE</code>.
* @return <tt>true</tt> if the annotation is only allowed in sources
* <tt>false</tt> otherwise
*/
public boolean hasSourceRetention() {
if (!runtimeRetention && !classRetention) return true;
return this.sourceRetention;
}

/** Sets the internal flag if the current annotation has
* <code>RetentionPolicy.SOURCE</code>.
*/
public void setSourceRetention(boolean flag) {
this.sourceRetention = flag;
}

/**
* Flag corresponding to <code>RetentionPolicy.CLASS</code>.
* @return <tt>true</tt> if the annotation is recorded by the compiler,
* but not visible at runtime
* <tt>false</tt> otherwise
*/
public boolean hasClassRetention() {
return this.classRetention;
}

/** Sets the internal flag if the current annotation has
* <code>RetentionPolicy.CLASS</code>.
*/
public void setClassRetention(boolean flag) {
this.classRetention = flag;
}

public void setAllowedTargets(int bitmap) {
this.allowedTargets = bitmap;
}

public boolean isTargetAllowed(int target) {
return (this.allowedTargets & target) == target;
}

public static String targetToName(int target) {
switch(target) {
case TYPE_TARGET:
return "TYPE";
case CONSTRUCTOR_TARGET:
return "CONSTRUCTOR";
case METHOD_TARGET:
return "METHOD";
case FIELD_TARGET:
return "FIELD";
case PARAMETER_TARGET:
return "PARAMETER";
case LOCAL_VARIABLE_TARGET:
return "LOCAL_VARIABLE";
case ANNOTATION_TARGET:
return "ANNOTATION";
case PACKAGE_TARGET:
return "PACKAGE";
default:
return "unknown target";
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ protected boolean isAnnotationCompatible() {
}

protected void addError(String msg, ASTNode expr) {
// GRECLIPSE: start: use new form of error message that has an end column
// GRECLIPSE add -- use new form of error message that has an end column
if (expr instanceof AnnotationNode) {
AnnotationNode aNode = (AnnotationNode) expr;
this.source.getErrorCollector().addErrorAndContinue(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ private static boolean isOverrideMethod(MethodNode method) {
}
ClassNode superClass = next.getUnresolvedSuperClass();
if (superClass != null) {
next = correctToGenericsSpecRecurse(updatedGenericsSpec, superClass);
next = correctToGenericsSpecRecurse(updatedGenericsSpec, superClass);
} else {
next = null;
}
Expand All @@ -291,7 +291,7 @@ private static boolean isOverrideMethod(MethodNode method) {
}

private static MethodNode getDeclaredMethodCorrected(Map genericsSpec, MethodNode mn, ClassNode correctedNext) {
for (MethodNode orig : correctedNext.getDeclaredMethods(mn.getName())) {
for (MethodNode orig : correctedNext.getDeclaredMethods(mn.getName())) {
MethodNode method = correctToGenericsSpec(genericsSpec, orig);
if (ParameterUtils.parametersEqual(method.getParameters(), mn.getParameters())) {
return method;
Expand Down Expand Up @@ -324,7 +324,7 @@ protected boolean isAnnotationCompatible() {
}

public void addError(String msg, ASTNode expr) {
// GRECLIPSE: start: use new form of error message that has an end column
// GRECLIPSE add -- use new form of error message that has an end column
if (expr instanceof AnnotationNode) {
AnnotationNode aNode = (AnnotationNode) expr;
this.source.getErrorCollector().addErrorAndContinue(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ private static boolean isOverrideMethod(MethodNode method) {
}
ClassNode superClass = next.getUnresolvedSuperClass();
if (superClass != null) {
next = correctToGenericsSpecRecurse(updatedGenericsSpec, superClass);
next = correctToGenericsSpecRecurse(updatedGenericsSpec, superClass);
} else {
next = null;
}
Expand All @@ -291,7 +291,7 @@ private static boolean isOverrideMethod(MethodNode method) {
}

private static MethodNode getDeclaredMethodCorrected(Map genericsSpec, MethodNode mn, ClassNode correctedNext) {
for (MethodNode orig : correctedNext.getDeclaredMethods(mn.getName())) {
for (MethodNode orig : correctedNext.getDeclaredMethods(mn.getName())) {
MethodNode method = correctToGenericsSpec(genericsSpec, orig);
if (ParameterUtils.parametersEqual(method.getParameters(), mn.getParameters())) {
return method;
Expand Down Expand Up @@ -324,7 +324,7 @@ protected boolean isAnnotationCompatible() {
}

public void addError(String msg, ASTNode expr) {
// GRECLIPSE: start: use new form of error message that has an end column
// GRECLIPSE add -- use new form of error message that has an end column
if (expr instanceof AnnotationNode) {
AnnotationNode aNode = (AnnotationNode) expr;
this.source.getErrorCollector().addErrorAndContinue(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ private void createAnnotationControls(Composite parent) {

Map<String, Integer> modifiers = new LinkedHashMap<>();
modifiers.put(NewWizardMessages.NewTypeWizardPage_modifiers_public, Flags.AccPublic);
//modifiers.put(NewWizardMessages.NewTypeWizardPage_modifiers_default, Flags.AccDefault);
modifiers.put(NewWizardMessages.NewTypeWizardPage_modifiers_default, Flags.AccDefault);
modifiers.put(NewWizardMessages.NewTypeWizardPage_modifiers_private, Flags.AccPrivate);
modifiers.put(NewWizardMessages.NewTypeWizardPage_modifiers_protected, Flags.AccProtected);

Expand Down

0 comments on commit bfd9996

Please sign in to comment.