Skip to content

Commit f849ff3

Browse files
eric-milleseric-milles
committed
minor edits
1 parent 03d8484 commit f849ff3

File tree

22 files changed

+131
-85
lines changed

22 files changed

+131
-85
lines changed

‎Site-org.codehaus.groovy.eclipse/pom.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@
7373
</activation>
7474

7575
<pluginRepositories>
76+
<pluginRepository>
77+
<id>jcenter</id>
78+
<url>https://jcenter.bintray.com</url>
79+
</pluginRepository>
7680
<pluginRepository>
7781
<id>spring-plugins-release</id>
7882
<name>Spring Plugins Repository</name>
@@ -182,7 +186,7 @@
182186
<dependency>
183187
<groupId>org.springframework.build</groupId>
184188
<artifactId>org.springframework.build.aws.ant</artifactId>
185-
<version>3.0.6.RELEASE</version>
189+
<version>3.1.0.RELEASE</version>
186190
</dependency>
187191
<dependency>
188192
<groupId>org.jets3t</groupId>
@@ -200,11 +204,6 @@
200204
</exclusion>
201205
</exclusions>
202206
</dependency>
203-
<dependency>
204-
<groupId>org.apache.ant</groupId>
205-
<artifactId>ant-nodeps</artifactId>
206-
<version>1.8.1</version>
207-
</dependency>
208207
</dependencies>
209208
</plugin>
210209
</plugins>

‎base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/ConfigurationTests.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ public void testTargetVersion() {
4747
String x15x = isAtLeastGroovy(30) ? "15" : "14";
4848
String x16x = isAtLeastGroovy(30) ? "16" : "14";
4949
String x17x = isAtLeastGroovy(30) ? "17" : "14";
50+
String x18x = isAtLeastGroovy(40) ? "18" : isAtLeastGroovy(30) ? "17" : "14";
5051

51-
String[] inputs = {"1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "5", "6", "7", "8", "9", "9.0", "10", "11", "12", "13", "14", "15", "16", "17"};
52-
String[] expect = {"1.4", "1.4", "1.5", "1.6", "1.7", "1.8", "9", "1.5", "1.6", "1.7", "1.8", "9", "9", "10", "11", "12", "13", "14", x15x, x16x, x17x};
52+
String[] inputs = {"1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "5", "6", "7", "8", "9", "9.0", "10", "11", "12", "13", "14", "15", "16", "17", "18"};
53+
String[] expect = {"1.4", "1.4", "1.5", "1.6", "1.7", "1.8", "9", "1.5", "1.6", "1.7", "1.8", "9", "9", "10", "11", "12", "13", "14", x15x, x16x, x17x, x18x};
5354
assertArrayEquals(expect, Arrays.stream(inputs).map(v -> { config.setTargetBytecode(v); return config.getTargetBytecode(); }).toArray(String[]::new));
5455
}
5556
}

‎base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/StaticCompilationTests.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5635,9 +5635,6 @@ public void testCompileStatic9607a() {
56355635

56365636
@Test
56375637
public void testCompileStatic9635() {
5638-
if (Float.parseFloat(System.getProperty("java.specification.version")) > 8)
5639-
vmArguments = new String[] {"--add-opens", "java.base/java.util.function=ALL-UNNAMED"};
5640-
56415638
//@formatter:off
56425639
String[] sources = {
56435640
"Main.groovy",
@@ -6058,9 +6055,6 @@ public void testCompileStatic9872() {
60586055

60596056
@Test
60606057
public void testCompileStatic9881() {
6061-
if (Float.parseFloat(System.getProperty("java.specification.version")) > 8)
6062-
vmArguments = new String[] {"--add-opens", "java.base/java.util.function=ALL-UNNAMED"};
6063-
60646058
//@formatter:off
60656059
String[] sources = {
60666060
"Main.groovy",

‎base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -603,9 +603,6 @@ public void testTypeChecked6455() {
603603

604604
@Test
605605
public void testTypeChecked6731() {
606-
if (Float.parseFloat(System.getProperty("java.specification.version")) > 8)
607-
vmArguments = new String[] {"--add-opens", "java.base/java.util.function=ALL-UNNAMED"};
608-
609606
//@formatter:off
610607
String[] sources = {
611608
"Main.groovy",
@@ -1431,9 +1428,6 @@ public void testTypeChecked8909a() {
14311428

14321429
@Test
14331430
public void testTypeChecked8917() {
1434-
if (Float.parseFloat(System.getProperty("java.specification.version")) > 8)
1435-
vmArguments = new String[] {"--add-opens", "java.base/java.util.stream=ALL-UNNAMED"};
1436-
14371431
//@formatter:off
14381432
String[] sources = {
14391433
"Main.groovy",
@@ -1450,9 +1444,6 @@ public void testTypeChecked8917() {
14501444

14511445
@Test
14521446
public void testTypeChecked8917a() {
1453-
if (Float.parseFloat(System.getProperty("java.specification.version")) > 8)
1454-
vmArguments = new String[] {"--add-opens", "java.base/java.util.stream=ALL-UNNAMED"};
1455-
14561447
//@formatter:off
14571448
String[] sources = {
14581449
"Main.groovy",
@@ -2961,9 +2952,6 @@ public void testTypeChecked9985b() {
29612952

29622953
@Test
29632954
public void testTypeChecked9991() {
2964-
if (Float.parseFloat(System.getProperty("java.specification.version")) > 8)
2965-
vmArguments = new String[] {"--add-opens", "java.base/java.util.function=ALL-UNNAMED"};
2966-
29672955
//@formatter:off
29682956
String[] sources = {
29692957
"Main.groovy",
@@ -3048,9 +3036,6 @@ public void testTypeChecked9997() {
30483036

30493037
@Test
30503038
public void testTypeChecked9998() {
3051-
if (Float.parseFloat(System.getProperty("java.specification.version")) > 8)
3052-
vmArguments = new String[] {"--add-opens", "java.base/java.util.stream=ALL-UNNAMED"};
3053-
30543039
//@formatter:off
30553040
String[] sources = {
30563041
"Main.groovy",
@@ -3293,9 +3278,6 @@ public void testTypeChecked10027() {
32933278

32943279
@Test
32953280
public void testTypeChecked10049() {
3296-
if (Float.parseFloat(System.getProperty("java.specification.version")) > 8)
3297-
vmArguments = new String[] {"--add-opens", "java.base/java.util.stream=ALL-UNNAMED"};
3298-
32993281
//@formatter:off
33003282
String[] sources = {
33013283
"Main.groovy",
@@ -3377,9 +3359,6 @@ public void testTypeChecked10052() {
33773359

33783360
@Test
33793361
public void testTypeChecked10053() {
3380-
if (Float.parseFloat(System.getProperty("java.specification.version")) > 8)
3381-
vmArguments = new String[] {"--add-opens", "java.base/java.util.stream=ALL-UNNAMED"};
3382-
33833362
//@formatter:off
33843363
String[] sources = {
33853364
"Main.groovy",
@@ -4683,9 +4662,6 @@ public void testTypeChecked10327() {
46834662

46844663
@Test
46854664
public void testTypeChecked10330() {
4686-
if (Float.parseFloat(System.getProperty("java.specification.version")) > 8)
4687-
vmArguments = new String[] {"--add-opens", "java.base/java.util.function=ALL-UNNAMED"};
4688-
46894665
//@formatter:off
46904666
String[] sources = {
46914667
"Main.groovy",

‎base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ public Expression transform(Expression expr) {
125125
mce.setSpreadSafe(pe.isSpreadSafe());
126126
mce.setMethodTarget(dmct);
127127
mce.setSourcePosition(pe);
128-
mce.copyNodeMetaData(pe);
129128
mce.setSafe(pe.isSafe());
130129
return mce;
131130
}
@@ -151,7 +150,20 @@ public Expression transform(Expression expr) {
151150
return booleanExpressionTransformer.transformBooleanExpression((BooleanExpression)expr);
152151
}
153152
if (expr instanceof VariableExpression) {
154-
return variableExpressionTransformer.transformVariableExpression((VariableExpression)expr);
153+
// GRECLIPSE edit -- GROOVY-6097, GROOVY-7300, et al.
154+
Expression exp2 = variableExpressionTransformer.transformVariableExpression((VariableExpression)expr);
155+
if (exp2 == expr) {
156+
MethodNode dmct = expr.getNodeMetaData(org.codehaus.groovy.transform.stc.StaticTypesMarker.DIRECT_METHOD_CALL_TARGET);
157+
// NOTE: BinaryExpressionTransformer handles the setter
158+
if (dmct != null && dmct.getParameters().length == 0) {
159+
MethodCallExpression mce = new MethodCallExpression(new VariableExpression("this"), dmct.getName(), MethodCallExpression.NO_ARGUMENTS);
160+
mce.getMethod().setSourcePosition(expr);
161+
mce.setMethodTarget(dmct);
162+
exp2 = mce;
163+
}
164+
}
165+
return exp2;
166+
// GRECLIPSE end
155167
}
156168
if (expr instanceof RangeExpression) {
157169
return rangeExpressionTransformer.transformRangeExpression(((RangeExpression)expr));

‎base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ public Expression transform(Expression expr) {
119119
mce.setSpreadSafe(pe.isSpreadSafe());
120120
mce.setMethodTarget(dmct);
121121
mce.setSourcePosition(pe);
122-
mce.copyNodeMetaData(pe);
123122
mce.setSafe(pe.isSafe());
124123
return mce;
125124
}
@@ -145,7 +144,20 @@ public Expression transform(Expression expr) {
145144
return booleanExpressionTransformer.transformBooleanExpression((BooleanExpression)expr);
146145
}
147146
if (expr instanceof VariableExpression) {
148-
return variableExpressionTransformer.transformVariableExpression((VariableExpression)expr);
147+
// GRECLIPSE edit -- GROOVY-6097, GROOVY-7300, et al.
148+
Expression exp2 = variableExpressionTransformer.transformVariableExpression((VariableExpression)expr);
149+
if (exp2 == expr) {
150+
MethodNode dmct = expr.getNodeMetaData(org.codehaus.groovy.transform.stc.StaticTypesMarker.DIRECT_METHOD_CALL_TARGET);
151+
// NOTE: BinaryExpressionTransformer handles the setter
152+
if (dmct != null && dmct.getParameters().length == 0) {
153+
MethodCallExpression mce = new MethodCallExpression(new VariableExpression("this"), dmct.getName(), MethodCallExpression.NO_ARGUMENTS);
154+
mce.getMethod().setSourcePosition(expr);
155+
mce.setMethodTarget(dmct);
156+
exp2 = mce;
157+
}
158+
}
159+
return exp2;
160+
// GRECLIPSE end
149161
}
150162
if (expr instanceof RangeExpression) {
151163
return rangeExpressionTransformer.transformRangeExpression(((RangeExpression)expr));

‎base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,15 @@ public void visitClassCodeContainer(final Statement code) {
108108

109109
@Override
110110
public Expression transform(final Expression expr) {
111+
if (expr instanceof StaticMethodCallExpression) {
112+
return staticMethodCallExpressionTransformer.transformStaticMethodCallExpression((StaticMethodCallExpression) expr);
113+
}
114+
if (expr instanceof MethodCallExpression) {
115+
return methodCallExpressionTransformer.transformMethodCallExpression((MethodCallExpression) expr);
116+
}
117+
if (expr instanceof ConstructorCallExpression) {
118+
return constructorCallTransformer.transformConstructorCall((ConstructorCallExpression) expr);
119+
}
111120
if (expr instanceof PropertyExpression) {
112121
MethodNode dmct = expr.getNodeMetaData(StaticTypesMarker.DIRECT_METHOD_CALL_TARGET);
113122
// NOTE: BinaryExpressionTransformer handles the setter
@@ -119,23 +128,24 @@ public Expression transform(final Expression expr) {
119128
mce.setSpreadSafe(pe.isSpreadSafe());
120129
mce.setMethodTarget(dmct);
121130
mce.setSourcePosition(pe);
122-
mce.copyNodeMetaData(pe);
123131
mce.setSafe(pe.isSafe());
124132
return mce;
125133
}
126134
return super.transform(expr);
127135
}
128-
if (expr instanceof StaticMethodCallExpression) {
129-
return staticMethodCallExpressionTransformer.transformStaticMethodCallExpression((StaticMethodCallExpression) expr);
130-
}
131-
if (expr instanceof MethodCallExpression) {
132-
return methodCallExpressionTransformer.transformMethodCallExpression((MethodCallExpression) expr);
133-
}
134-
if (expr instanceof ConstructorCallExpression) {
135-
return constructorCallTransformer.transformConstructorCall((ConstructorCallExpression) expr);
136-
}
137136
if (expr instanceof VariableExpression) {
138-
return variableExpressionTransformer.transformVariableExpression((VariableExpression) expr);
137+
Expression exp2 = variableExpressionTransformer.transformVariableExpression((VariableExpression) expr);
138+
if (exp2 == expr) {
139+
MethodNode dmct = expr.getNodeMetaData(StaticTypesMarker.DIRECT_METHOD_CALL_TARGET);
140+
// NOTE: BinaryExpressionTransformer handles the setter
141+
if (dmct != null && dmct.getParameters().length == 0) {
142+
MethodCallExpression mce = new MethodCallExpression(new VariableExpression("this"), dmct.getName(), MethodCallExpression.NO_ARGUMENTS);
143+
mce.getMethod().setSourcePosition(expr);
144+
mce.setMethodTarget(dmct);
145+
exp2 = mce;
146+
}
147+
}
148+
return exp2;
139149
}
140150
if (expr instanceof ClosureExpression) {
141151
return closureExpressionTransformer.transformClosureExpression((ClosureExpression) expr);

‎ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/launch/GroovyScriptLaunchShortcutTests.groovy‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
*/
1616
package org.codehaus.groovy.eclipse.test.launch
1717

18+
import static org.eclipse.jdt.core.JavaCore.getPlugin as getJavaPlugin
19+
import static org.junit.Assume.assumeTrue
20+
1821
import org.codehaus.groovy.eclipse.core.compiler.CompilerUtils
1922
import org.codehaus.groovy.eclipse.launchers.GroovyScriptLaunchShortcut
2023
import org.codehaus.groovy.eclipse.test.GroovyEclipseTestSuite
@@ -294,6 +297,10 @@ final class GroovyScriptLaunchShortcutTests extends GroovyEclipseTestSuite {
294297

295298
@Test // https://github.com/groovy/groovy-eclipse/issues/1299
296299
void testScriptLaunch15() {
300+
// ensure JUnit 5 container
301+
def jdt = javaPlugin.bundle.version
302+
assumeTrue(jdt.major > 3 || jdt.minor >= 18)
303+
297304
def shortcut = new GroovyScriptLaunchShortcut()
298305
def unitType = addGroovySource('print "hello"', 'script').getType('script')
299306

‎jdt-patch/e410/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/util/TestVerifier.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ private String getVerifyTestsCode() {
385385
"}";
386386
}
387387
private String[] getVMArguments(String[] vmArguments) {
388-
List<String> completeVmArguments = new ArrayList<String>();
388+
List<String> completeVmArguments = new ArrayList<>();
389389

390390
if (Float.parseFloat(System.getProperty("java.specification.version")) > 8) {
391391
Collections.addAll(completeVmArguments, "--add-opens", "java.base/java.io=ALL-UNNAMED");
@@ -395,8 +395,10 @@ private String[] getVMArguments(String[] vmArguments) {
395395
Collections.addAll(completeVmArguments, "--add-opens", "java.base/java.text=ALL-UNNAMED");
396396
Collections.addAll(completeVmArguments, "--add-opens", "java.base/java.util=ALL-UNNAMED");
397397
Collections.addAll(completeVmArguments, "--add-opens", "java.base/java.util.regex=ALL-UNNAMED");
398+
Collections.addAll(completeVmArguments, "--add-opens", "java.base/java.util.stream=ALL-UNNAMED");
398399
Collections.addAll(completeVmArguments, "--add-opens", "java.base/java.lang.invoke=ALL-UNNAMED");
399400
Collections.addAll(completeVmArguments, "--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED");
401+
Collections.addAll(completeVmArguments, "--add-opens", "java.base/java.util.function=ALL-UNNAMED");
400402
}
401403

402404
if (vmArguments != null) {

‎jdt-patch/e411/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/util/TestVerifier.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ private String getVerifyTestsCode() {
385385
"}";
386386
}
387387
private String[] getVMArguments(String[] vmArguments) {
388-
List<String> completeVmArguments = new ArrayList<String>();
388+
List<String> completeVmArguments = new ArrayList<>();
389389

390390
if (Float.parseFloat(System.getProperty("java.specification.version")) > 8) {
391391
Collections.addAll(completeVmArguments, "--add-opens", "java.base/java.io=ALL-UNNAMED");
@@ -395,8 +395,10 @@ private String[] getVMArguments(String[] vmArguments) {
395395
Collections.addAll(completeVmArguments, "--add-opens", "java.base/java.text=ALL-UNNAMED");
396396
Collections.addAll(completeVmArguments, "--add-opens", "java.base/java.util=ALL-UNNAMED");
397397
Collections.addAll(completeVmArguments, "--add-opens", "java.base/java.util.regex=ALL-UNNAMED");
398+
Collections.addAll(completeVmArguments, "--add-opens", "java.base/java.util.stream=ALL-UNNAMED");
398399
Collections.addAll(completeVmArguments, "--add-opens", "java.base/java.lang.invoke=ALL-UNNAMED");
399400
Collections.addAll(completeVmArguments, "--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED");
401+
Collections.addAll(completeVmArguments, "--add-opens", "java.base/java.util.function=ALL-UNNAMED");
400402
}
401403

402404
if (vmArguments != null) {

0 commit comments

Comments
 (0)