From 2ddfe33bb3fbd944ff3ec32232c2ad9ee0998a87 Mon Sep 17 00:00:00 2001 From: Lukas Stadler <lukas.stadler@oracle.com> Date: Fri, 4 Aug 2017 17:01:39 +0200 Subject: [PATCH] handle single-element candidates in command line completion --- .../com/oracle/truffle/r/launcher/JLineConsoleCompleter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/JLineConsoleCompleter.java b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/JLineConsoleCompleter.java index 12888c364f..dc79ee71d2 100644 --- a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/JLineConsoleCompleter.java +++ b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/JLineConsoleCompleter.java @@ -79,7 +79,10 @@ public class JLineConsoleCompleter implements Completer { if (completionEnv.hasMember("comps")) { Value completions = completionEnv.getMember("comps"); - if (completions.hasArrayElements()) { + if (completions.isString()) { + candidates.add(completions.asString()); + return start; + } else if (completions.hasArrayElements()) { long length = completions.getArraySize(); List<String> result = new ArrayList<>((int) length); for (int i = 0; i < length; i++) { -- GitLab