-
Notifications
You must be signed in to change notification settings - Fork 378
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ignore all annotations in all scopes if source is missing (#10021)
JDT supports three kinds of annotations, and the ASTVisitor lets them be encountered in two different scopes. This patch ensures that all six cases are handled, and adds a test that uses each of the six cases - removing any one of the `visit` implementations will fail the test by incorrectly reporting the annotation as not having sources available. Fixes #10020
- Loading branch information
Showing
5 changed files
with
132 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
dev/core/test/com/google/gwt/dev/jjs/impl/AnnotationCompilerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/* | ||
* Copyright 2024 GWT Project Authors | ||
* | ||
* Licensed 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 com.google.gwt.dev.jjs.impl; | ||
|
||
import com.google.gwt.core.ext.UnableToCompleteException; | ||
import com.google.gwt.thirdparty.guava.common.base.Joiner; | ||
|
||
public class AnnotationCompilerTest extends FullCompileTestBase { | ||
@Override | ||
protected void optimizeJava() { | ||
} | ||
|
||
public void testUseAnnotationWithoutSource() throws UnableToCompleteException { | ||
// The JDT represents annotations as three kinds: markers, which have no members, | ||
// single-member, which have only one member, and normal, which have more than one. | ||
// This test validates that all three work in two cases each: block scope, and class | ||
// scope. | ||
|
||
String annotations = Joiner.on(" ").join( | ||
"@SampleBytecodeOnlyMarkerAnnotation", | ||
"@SampleBytecodeOnlySingleMemberAnnotation(\"abc\")", | ||
"@SampleBytecodeOnlyNormalAnnotation(a=1, b=2)" | ||
); | ||
|
||
String code = Joiner.on('\n').join( | ||
"package test;", | ||
"import com.google.gwt.dev.jjs.impl.*;", | ||
"public class EntryPoint<T extends " + annotations + " Object> {", | ||
" public static void onModuleLoad() {", | ||
" }", | ||
" " + annotations + " public String foo() {", | ||
" return \"\";", | ||
" }", | ||
"}"); | ||
|
||
compileSnippetToJS(code); | ||
} | ||
} |
20 changes: 20 additions & 0 deletions
20
dev/core/test/com/google/gwt/dev/jjs/impl/SampleBytecodeOnlyMarkerAnnotation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
/* | ||
* Copyright 2024 GWT Project Authors | ||
* | ||
* Licensed 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 com.google.gwt.dev.jjs.impl; | ||
|
||
/** | ||
* Annotation with no bytecode for GWT, and no members. | ||
*/ | ||
public @interface SampleBytecodeOnlyMarkerAnnotation { | ||
} |
22 changes: 22 additions & 0 deletions
22
dev/core/test/com/google/gwt/dev/jjs/impl/SampleBytecodeOnlyNormalAnnotation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
/* | ||
* Copyright 2024 GWT Project Authors | ||
* | ||
* Licensed 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 com.google.gwt.dev.jjs.impl; | ||
|
||
/** | ||
* Annotation with no bytecode for GWT, and multiple members. | ||
*/ | ||
public @interface SampleBytecodeOnlyNormalAnnotation { | ||
int a(); | ||
int b(); | ||
} |
21 changes: 21 additions & 0 deletions
21
dev/core/test/com/google/gwt/dev/jjs/impl/SampleBytecodeOnlySingleMemberAnnotation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/* | ||
* Copyright 2024 GWT Project Authors | ||
* | ||
* Licensed 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 com.google.gwt.dev.jjs.impl; | ||
|
||
/** | ||
* Annotation with no bytecode for GWT, and a single member. | ||
*/ | ||
public @interface SampleBytecodeOnlySingleMemberAnnotation { | ||
String value(); | ||
} |