From 1e25ddfc1053356edc261c083a76734064a71644 Mon Sep 17 00:00:00 2001 From: mattirn Date: Fri, 20 Dec 2024 15:16:17 +0100 Subject: [PATCH] Groovy REPL: script file detection/execution fails, fixes #1139 --- .../org/jline/console/impl/ConsoleEngineImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/console/src/main/java/org/jline/console/impl/ConsoleEngineImpl.java b/console/src/main/java/org/jline/console/impl/ConsoleEngineImpl.java index d8e1a0944..c53188360 100644 --- a/console/src/main/java/org/jline/console/impl/ConsoleEngineImpl.java +++ b/console/src/main/java/org/jline/console/impl/ConsoleEngineImpl.java @@ -521,7 +521,7 @@ private String expandParameterName(String parameter) { private void internalExecute() throws Exception { if (isEngineScript()) { - result = engine.execute(script, expandParameters(args)); + result = engine.execute(script.toFile(), expandParameters(args)); } else if (isConsoleScript()) { executing = true; boolean done = true; @@ -669,9 +669,13 @@ public Object execute(String cmd, String line, String[] args) throws Exception { if (parser().validCommandName(cmd)) { file = new ScriptFile(cmd, line, args); } else { - Path f = Paths.get(line.split("\\s+")[0]); - if (Files.exists(f)) { - file = new ScriptFile(f, line, args); + try { + Path f = Paths.get(line.split("\\s+")[0]); + if (Files.exists(f)) { + file = new ScriptFile(f, line, args); + } + } catch (Exception e) { + Log.trace("Failed to get Path: ", e); } } if (file != null && file.execute()) {