Fix method conflicts between JDK13 and GDK(closes #1139)

daniellansun · daniellansun · commit 3d85ccb76f88 · 2020-01-23T01:13:34.000+08:00
diff --git a/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
@@ -21,19 +21,24 @@
 import groovy.lang.Closure;
 import groovy.lang.EmptyRange;
 import groovy.lang.GString;
+import groovy.lang.GroovyRuntimeException;
 import groovy.lang.IntRange;
 import groovy.lang.Range;
 import groovy.transform.stc.ClosureParams;
 import groovy.transform.stc.FromString;
 import groovy.transform.stc.PickFirstResolver;
 import org.apache.groovy.io.StringBuilderWriter;
+import org.apache.groovy.lang.annotation.Incubating;
 import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
 import org.codehaus.groovy.util.CharSequenceReader;
 
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -2599,6 +2604,29 @@ public static String stripIndent(CharSequence self) {
         return stripIndent(self, runningCount == -1 ? 0 : runningCount);
     }
 
+    /**
+     * Same logic to {@link #stripIndent(CharSequence)} if {@code forceGroovyBehavior} is {@code true},
+     * otherwise Java13's {@code stripIndent} will be invoked
+     *
+     * @param self The CharSequence to strip the leading spaces from
+     * @param forceGroovyBehavior force groovy behavior to avoid conflicts with Java13's stripIndent
+     * @since 3.0.0
+     */
+    @Incubating
+    public static String stripIndent(CharSequence self, boolean forceGroovyBehavior) {
+        if (!forceGroovyBehavior) {
+            try {
+                MethodHandle mh = MethodHandles.lookup().findVirtual(self.getClass(), "stripIndent", MethodType.methodType(String.class));
+                return (String) mh.bindTo(self).invokeWithArguments();
+            } catch (NoSuchMethodException | IllegalAccessException ignored) {
+            } catch (Throwable t) {
+                throw new GroovyRuntimeException(t);
+            }
+        }
+
+        return stripIndent(self);
+    }
+
     /**
      * Strip <tt>numChar</tt> leading characters from
      * every line in a CharSequence.
diff --git a/src/test/groovy/lang/ScriptSourcePositionInAstTest.groovy b/src/test/groovy/lang/ScriptSourcePositionInAstTest.groovy
@@ -49,7 +49,7 @@ class ScriptSourcePositionInAstTest extends GroovyTestCase {
         assert positionsForScript("""\
             println 'hello'
             println 'bye'
-        """.stripIndent()) == [[1, 1], [2, 14]]
+        """.stripIndent(true)) == [[1, 1], [2, 14]]
     }
 
     void testScriptWithClasses() {
@@ -58,6 +58,6 @@ class ScriptSourcePositionInAstTest extends GroovyTestCase {
             println 'hello'
             println 'bye'
             class Baz{}
-        """.stripIndent()) == [[2, 1], [3, 14]]
+        """.stripIndent(true)) == [[2, 1], [3, 14]]
     }
 }
diff --git a/src/test/groovy/lang/StripMarginTest.groovy b/src/test/groovy/lang/StripMarginTest.groovy
@@ -57,7 +57,7 @@ class StripMarginTest extends GroovyTestCase {
             def method() {
                 return 'bar'
             }
-        """.stripIndent()
+        """.stripIndent(true)
 
         def expected = """
     return 'foo'
@@ -79,7 +79,7 @@ def method() {
             def method() {
                 return 'bar'
             }
-        """.stripIndent()
+        """.stripIndent(true)
         
         def expected = """\
     return 'foo'

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class ScriptSourcePositionInAstTest extends GroovyTestCase {`
`49`	`49`	`assert positionsForScript("""\`
`50`	`50`	`println 'hello'`
`51`	`51`	`println 'bye'`
`52`		`- """.stripIndent()) == [[1, 1], [2, 14]]`
	`52`	`+ """.stripIndent(true)) == [[1, 1], [2, 14]]`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`void testScriptWithClasses() {`
`@@ -58,6 +58,6 @@ class ScriptSourcePositionInAstTest extends GroovyTestCase {`
`58`	`58`	`println 'hello'`
`59`	`59`	`println 'bye'`
`60`	`60`	`class Baz{}`
`61`		`- """.stripIndent()) == [[2, 1], [3, 14]]`
	`61`	`+ """.stripIndent(true)) == [[2, 1], [3, 14]]`
`62`	`62`	`}`
`63`	`63`	`}`