GROOVY-8162: Update Groovysh to JLine3 (clarify duplicate method handling)

paulk-asert · paulk-asert · commit 23af6c6270c9 · 2025-08-05T21:29:13.000+10:00
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/jline/GroovyEngine.java b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/jline/GroovyEngine.java
@@ -164,7 +164,7 @@ public interface Cloner {
     public GroovyEngine() {
         sharedData = new Binding();
 // for debugging
-//        sharedData.setVariable("engine", this);
+        sharedData.setVariable("engine", this);
         classLoader = new EngineClassLoader();
         shell = new GroovyShell(classLoader, sharedData);
         for (String s : DEFAULT_IMPORTS) {
@@ -577,7 +577,12 @@ private boolean methodDef(String statement) throws Exception {
             methodNames.add(m.group(3));
             if (isInterpreterMode()) {
                 String code = removeTrailingSemi(m.group(0));
-                methods.put(m.group(2), addSnippet(SnippetType.METHOD, code));
+                Integer existing = methods.get(m.group(2));
+                if (existing != null) {
+                    snippets.get(existing).setSnippet(code);
+                } else {
+                    methods.put(m.group(2), addSnippet(SnippetType.METHOD, code));
+                }
             } else {
                 String body = m.group(5).substring(1);
                 put(m.group(3), execute("{" + m.group(4) + "->" + body));
@@ -654,8 +659,10 @@ public void removeMethod(String name) {
                 String k = it.next();
                 if (k.equals(name) || k.startsWith(name + "(")) {
                     Integer gone = methods.get(k);
-                    if (gone != null) snippets.set(gone, null);
-                    it.remove();
+                    if (gone != null) {
+                        snippets.set(gone, null);
+                        it.remove();
+                    }
                 }
             }
         }
diff --git a/subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc b/subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc
@@ -248,7 +248,7 @@ This behavior can be changed by activating <<GroovyShell-InterpreterMode,interpr
 
 Methods can be defined in the shell, and will be saved for later use.
 
-Defining a function is easy:
+Defining a method is easy:
 
 [source,jshell]
 ----------------------------------
@@ -265,9 +265,15 @@ groovy> hello "Jason"
 Hello Jason
 --------------
 
-Internally the shell creates a closure to encapsulate the function and
-then binds the closure to a variable. So variables and functions share
-the same namespace.
+If a method definition has the same signature as an existing definition,
+the old definition will be replaced with the new one.
+
+When in _interpreterMode_, methods are remembered and given as extra statements
+when executing the next input.
+
+When not in _interpreterMode_, the shell internally creates a closure to encapsulate
+the method and stores it in the shared variables.
+In this case, variables and methods share the same namespace.
 
 [[GroovyShell-Exceptions]]
 ==== Exceptions
