Repository: groovy Updated Branches: refs/heads/master 29791eb42 -> b71c37dbb
GROOVY-8435: @Immutable should use the cache setting of @ToString Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/b71c37db Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/b71c37db Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/b71c37db Branch: refs/heads/master Commit: b71c37dbb27adb0daab779b93f30d3dfc062a5b9 Parents: 29791eb Author: paulk <[email protected]> Authored: Mon Jan 8 23:05:42 2018 +1000 Committer: paulk <[email protected]> Committed: Mon Jan 8 23:05:42 2018 +1000 ---------------------------------------------------------------------- .../org/codehaus/groovy/transform/ImmutableASTTransformation.java | 2 +- .../org/codehaus/groovy/transform/ToStringASTTransformation.java | 2 +- .../groovy/inspect/swingui/AstNodeToScriptAdapterTest.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/b71c37db/src/main/java/org/codehaus/groovy/transform/ImmutableASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/transform/ImmutableASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/ImmutableASTTransformation.java index 9a0a90a..97d5033 100644 --- a/src/main/java/org/codehaus/groovy/transform/ImmutableASTTransformation.java +++ b/src/main/java/org/codehaus/groovy/transform/ImmutableASTTransformation.java @@ -210,7 +210,7 @@ public class ImmutableASTTransformation extends AbstractASTTransformation { createEquals(cNode, false, false, false, null, null); } if (!hasAnnotation(cNode, ToStringASTTransformation.MY_TYPE)) { - createToString(cNode, false, false, null, null, false, true); + createToString(cNode, false, false, null, null, false, true, true, true); } if( memberHasValue(node, MEMBER_ADD_COPY_WITH, true) && !pList.isEmpty() && http://git-wip-us.apache.org/repos/asf/groovy/blob/b71c37db/src/main/java/org/codehaus/groovy/transform/ToStringASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/transform/ToStringASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/ToStringASTTransformation.java index 36f376f..470e4c8 100644 --- a/src/main/java/org/codehaus/groovy/transform/ToStringASTTransformation.java +++ b/src/main/java/org/codehaus/groovy/transform/ToStringASTTransformation.java @@ -124,7 +124,7 @@ public class ToStringASTTransformation extends AbstractASTTransformation { } public static void createToString(ClassNode cNode, boolean includeSuper, boolean includeFields, List<String> excludes, List<String> includes, boolean includeNames, boolean ignoreNulls, boolean includePackage, boolean cache) { - createToString(cNode, includeSuper, includeFields, excludes, includes, includeNames, ignoreNulls, includePackage, false, false); + createToString(cNode, includeSuper, includeFields, excludes, includes, includeNames, ignoreNulls, includePackage, cache, false); } public static void createToString(ClassNode cNode, boolean includeSuper, boolean includeFields, List<String> excludes, List<String> includes, boolean includeNames, boolean ignoreNulls, boolean includePackage, boolean cache, boolean includeSuperProperties) { http://git-wip-us.apache.org/repos/asf/groovy/blob/b71c37db/subprojects/groovy-console/src/test/groovy/groovy/inspect/swingui/AstNodeToScriptAdapterTest.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/test/groovy/groovy/inspect/swingui/AstNodeToScriptAdapterTest.groovy b/subprojects/groovy-console/src/test/groovy/groovy/inspect/swingui/AstNodeToScriptAdapterTest.groovy index 1884feb..a194286 100644 --- a/subprojects/groovy-console/src/test/groovy/groovy/inspect/swingui/AstNodeToScriptAdapterTest.groovy +++ b/subprojects/groovy-console/src/test/groovy/groovy/inspect/swingui/AstNodeToScriptAdapterTest.groovy @@ -548,7 +548,7 @@ class AstNodeToScriptAdapterTest extends GroovyTestCase { assert result.contains('public java.lang.String toString()') assert result.contains("_result.append('Event(')") assert result.contains("_result.append(')')") - assert result.contains('return _result.toString()') + assert result.contains('return $to$string') } void testToStringClassAndStaticMethodCallExpression() {
