honour readline setting for auto_history

Author: timfel

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/ConsoleHandler.java

@@ -45,9 +45,12 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.function.BiConsumer;
+import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.Supplier;
+import java.util.function.IntConsumer;
+import java.util.function.IntFunction;
+import java.util.function.IntSupplier;
 
 import org.graalvm.polyglot.Context;
 
@@ -73,7 +76,8 @@ public void setContext(@SuppressWarnings("unused") Context context) {
     }
 
     @SuppressWarnings("unused")
-    public void setHistory(Supplier<Integer> getSize, Consumer<String> addItem, Function<Integer, String> getItem, BiConsumer<Integer, String> setItem, Consumer<Integer> removeItem, Runnable clear) {
+    public void setHistory(BooleanSupplier shouldRecord, IntSupplier getSize, Consumer<String> addItem, IntFunction<String> getItem, BiConsumer<Integer, String> setItem, IntConsumer removeItem,
+                    Runnable clear) {
         // ignore by default
     }
 

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -593,15 +593,21 @@ public int readEvalPrint(Context context, ConsoleHandler consoleHandler) {
     }
 
     private void setupReadline(Context context, ConsoleHandler consoleHandler) {
-        final Value readline = context.eval(Source.newBuilder(getLanguageId(), "import readline; readline", "setup-interactive").interactive(true).buildLiteral());
+        // First run nothing to trigger the setup of interactive mode (site import and so on)
+        context.eval(Source.newBuilder(getLanguageId(), "None", "setup-interactive").interactive(true).buildLiteral());
+        // Then we can get the readline module and see if any completers were registered and use its
+        // history feature
+        final Value readline = context.eval(Source.newBuilder(getLanguageId(), "import readline; readline", "setup-interactive").buildLiteral());
         final Value completer = readline.getMember("get_completer").execute();
+        final Value shouldRecord = readline.getMember("get_auto_history");
         final Value addHistory = readline.getMember("add_history");
         final Value getHistoryItem = readline.getMember("get_history_item");
         final Value setHistoryItem = readline.getMember("replace_history_item");
         final Value deleteHistoryItem = readline.getMember("remove_history_item");
         final Value clearHistory = readline.getMember("clear_history");
         final Value getHistorySize = readline.getMember("get_current_history_length");
         consoleHandler.setHistory(
+                        () -> shouldRecord.execute().asBoolean(),
                         () -> getHistorySize.execute().asInt(),
                         (item) -> addHistory.execute(item),
                         (pos) -> getHistoryItem.execute(pos).asString(),

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/JLineConsoleHandler.java

@@ -47,9 +47,12 @@
 import java.util.List;
 import java.util.ListIterator;
 import java.util.function.BiConsumer;
+import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.Supplier;
+import java.util.function.IntConsumer;
+import java.util.function.IntFunction;
+import java.util.function.IntSupplier;
 
 import org.graalvm.polyglot.Context;
 
@@ -95,12 +98,13 @@ public int complete(String buffer, int cursor, List<CharSequence> candidates) {
     }
 
     @Override
-    public void setHistory(Supplier<Integer> getSize, Consumer<String> addItem, Function<Integer, String> getItem, BiConsumer<Integer, String> setItem, Consumer<Integer> removeItem, Runnable clear) {
+    public void setHistory(BooleanSupplier shouldRecord, IntSupplier getSize, Consumer<String> addItem, IntFunction<String> getItem, BiConsumer<Integer, String> setItem, IntConsumer removeItem,
+                    Runnable clear) {
         console.setHistory(new History() {
-            private int pos = getSize.get();
+            private int pos = getSize.getAsInt();
 
             public int size() {
-                return getSize.get();
+                return getSize.getAsInt();
             }
 
             public void set(int arg0, CharSequence arg1) {
@@ -216,8 +220,10 @@ public void clear() {
             }
 
             public void add(CharSequence arg0) {
-                addItem.accept(arg0.toString());
-                pos = size();
+                if (shouldRecord.getAsBoolean()) {
+                    addItem.accept(arg0.toString());
+                    pos = size();
+                }
             }
         });
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ReadlineModuleBuiltins.java

@@ -83,7 +83,8 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     private static final class LocalData implements TruffleObject {
         private final HashMap<String, String> bindings = new HashMap<>();
         private final List<String> history = new ArrayList<>();
-        protected Object completer;
+        protected Object completer = null;
+        public boolean autoHistory = true;
 
         public ForeignAccess getForeignAccess() {
             return null;
@@ -320,4 +321,27 @@ PNone setCompleter() {
             return PNone.NONE;
         }
     }
+
+    @Builtin(name = "get_auto_history", fixedNumOfPositionalArgs = 1, declaresExplicitSelf = true)
+    @GenerateNodeFactory
+    abstract static class GetAutoHistoryNode extends PythonUnaryBuiltinNode {
+        @Specialization
+        boolean setCompleter(PythonModule self,
+                        @Cached("create()") ReadAttributeFromObjectNode readNode) {
+            LocalData data = (LocalData) readNode.execute(self, DATA);
+            return data.autoHistory;
+        }
+    }
+
+    @Builtin(name = "set_auto_history", fixedNumOfPositionalArgs = 2, declaresExplicitSelf = true)
+    @GenerateNodeFactory
+    abstract static class SetAutoHistoryNode extends PythonBinaryBuiltinNode {
+        @Specialization
+        PNone setCompleter(PythonModule self, boolean enabled,
+                        @Cached("create()") ReadAttributeFromObjectNode readNode) {
+            LocalData data = (LocalData) readNode.execute(self, DATA);
+            data.autoHistory = enabled;
+            return PNone.NONE;
+        }
+    }
 }