GROOVY-8162: Update Groovysh to JLine3 (fix /!ls handling regression)

paulk-asert · paulk-asert · commit b5622c64ab49 · 2025-08-05T21:28:49.000+10:00
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/jline/GroovySystemRegistry.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/jline/GroovySystemRegistry.groovy
@@ -36,14 +36,14 @@ class GroovySystemRegistry extends SystemRegistryImpl {
     // workaround for: https://github.com/jline/jline3/issues/1361
     @Override
     Object execute(String line) throws Exception {
+        line = line.startsWith("/!") ? line.replaceFirst("/!", "/! ") : line
         def m = line =~ /([a-zA-Z][a-zA-Z0-9_]*)(\s*)=(\s*)(\/?)(\S.*)/
         def target = null
         if (m.matches()) {
             def (_, variable, space1, space2, slash, rhs) = m[0]
             if (slash) {
                 target = variable
                 line = slash + rhs
-                line = line.startsWith("/!") ? line.replaceFirst("/!", "/! ") : line
             } else {
                 space1 = space1.size() == 0 ? ' ' : space1
                 space2 = space2.size() == 0 ? ' ' : space2
