You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2019/05/04 05:15:31 UTC
[groovy] branch GROOVY_2_5_X updated (db5da84 -> 4bde222)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from db5da84 GROOVY-9101: Add context menus to Console's input & output areas (closes #918)
new 2a524cc minor refactor: set source position
new 53cbe1d GROOVY-9101: Fix "Select All" of text editor
new 4bde222 GROOVY-9058: each parameter type not correctly inferred in Object[] case (closes #921)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/codehaus/groovy/classgen/AsmClassGenerator.java | 1 +
.../groovy/transform/stc/StaticTypeCheckingVisitor.java | 6 +-----
.../transform/stc/ClosureParamTypeInferenceSTCTest.groovy | 15 +++++++++++++++
.../src/main/groovy/groovy/ui/Console.groovy | 2 +-
4 files changed, 18 insertions(+), 6 deletions(-)
[groovy] 02/03: GROOVY-9101: Fix "Select All" of text editor
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 53cbe1debf61a0a4f3b3eb7173534b9eda210030
Author: aalmiray <aa...@gmail.com>
AuthorDate: Sat May 4 12:02:34 2019 +0800
GROOVY-9101: Fix "Select All" of text editor
---
subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy
index 27c5e03..200646a 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy
+++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy
@@ -1564,7 +1564,7 @@ class Console implements CaretListener, HyperlinkListener, ComponentListener, Fo
}
void selectAll(EventObject evt = null) {
- invokeTextAction(evt, { source -> source.selectAll() }, copyFromComponent ?: inputEditor.textEditor)
+ invokeTextAction(evt, { source -> source.selectAll() }, copyFromComponent ?: inputArea)
}
void setRowNumAndColNum() {
[groovy] 01/03: minor refactor: set source position
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 2a524cc85f70770ad7d0a74bef1589fb5c61a0a5
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 3 15:44:34 2019 +1000
minor refactor: set source position
---
src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java b/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
index 8670c38..aa49f5e 100644
--- a/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
+++ b/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
@@ -989,6 +989,7 @@ public class AsmClassGenerator extends ClassGenerator {
new ClassExpression(outer),
expression.getProperty()
);
+ pexp.getObjectExpression().setSourcePosition(objectExpression);
pexp.visit(controller.getAcg());
return;
}
[groovy] 03/03: GROOVY-9058: each parameter type not correctly
inferred in Object[] case (closes #921)
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 4bde222a4e2a69a47afc73ea5a52b6087215a9d3
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri May 3 20:50:14 2019 +1000
GROOVY-9058: each parameter type not correctly inferred in Object[] case (closes #921)
---
.../groovy/transform/stc/StaticTypeCheckingVisitor.java | 6 +-----
.../transform/stc/ClosureParamTypeInferenceSTCTest.groovy | 15 +++++++++++++++
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index 9c8b763..922c7ce 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -2945,11 +2945,7 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
}
boolean lastArg = i == length - 1;
- if (lastArg && inferredType.isArray()) {
- if (inferredType.getComponentType().equals(originType)) {
- inferredType = originType;
- }
- } else if (!typeCheckMethodArgumentWithGenerics(originType, inferredType, lastArg)) {
+ if (!typeCheckMethodArgumentWithGenerics(originType, inferredType, lastArg)) {
addError("Expected parameter of type " + inferredType.toString(false) + " but got " + originType.toString(false), closureParam.getType());
}
diff --git a/src/test/groovy/transform/stc/ClosureParamTypeInferenceSTCTest.groovy b/src/test/groovy/transform/stc/ClosureParamTypeInferenceSTCTest.groovy
index 0c0ba80..5b76f4f 100644
--- a/src/test/groovy/transform/stc/ClosureParamTypeInferenceSTCTest.groovy
+++ b/src/test/groovy/transform/stc/ClosureParamTypeInferenceSTCTest.groovy
@@ -1325,4 +1325,19 @@ def method() {
method()
'''
}
+
+ void testGroovy9058() {
+ assertScript '''
+ List<Object[]> bar() { [['fee', 'fi'] as Object[], ['fo', 'fum'] as Object[]] }
+
+ def foo() {
+ def result = []
+ List<Object[]> bar = bar()
+ bar.each { row -> result << row[0].toString().toUpperCase() }
+ result
+ }
+
+ assert foo() == ['FEE', 'FO']
+ '''
+ }
}