Provide a tab completion handler for JLine. Adds BUKKIT-4168
This commit is contained in:
parent
5f65cd9a1c
commit
ffcd0f4502
@ -55,6 +55,7 @@ public abstract class PlayerList {
|
|||||||
public PlayerList(MinecraftServer minecraftserver) {
|
public PlayerList(MinecraftServer minecraftserver) {
|
||||||
minecraftserver.server = new CraftServer(minecraftserver, this);
|
minecraftserver.server = new CraftServer(minecraftserver, this);
|
||||||
minecraftserver.console = org.bukkit.craftbukkit.command.ColouredConsoleSender.getInstance();
|
minecraftserver.console = org.bukkit.craftbukkit.command.ColouredConsoleSender.getInstance();
|
||||||
|
minecraftserver.reader.addCompleter(new org.bukkit.craftbukkit.command.ConsoleCommandCompleter(minecraftserver.server));
|
||||||
this.cserver = minecraftserver.server;
|
this.cserver = minecraftserver.server;
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
|
|
||||||
|
@ -0,0 +1,47 @@
|
|||||||
|
package org.bukkit.craftbukkit.command;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.concurrent.ExecutionException;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
|
import org.bukkit.craftbukkit.util.Waitable;
|
||||||
|
|
||||||
|
import jline.console.completer.Completer;
|
||||||
|
|
||||||
|
public class ConsoleCommandCompleter implements Completer {
|
||||||
|
private final CraftServer server;
|
||||||
|
|
||||||
|
public ConsoleCommandCompleter(CraftServer server) {
|
||||||
|
this.server = server;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int complete(final String buffer, final int cursor, final List<CharSequence> candidates) {
|
||||||
|
Waitable<List<String>> waitable = new Waitable<List<String>>() {
|
||||||
|
@Override
|
||||||
|
protected List<String> evaluate() {
|
||||||
|
return server.getCommandMap().tabComplete(server.getConsoleSender(), buffer);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
this.server.getServer().processQueue.add(waitable);
|
||||||
|
try {
|
||||||
|
List<String> offers = waitable.get();
|
||||||
|
if (offers == null) {
|
||||||
|
return cursor;
|
||||||
|
}
|
||||||
|
candidates.addAll(offers);
|
||||||
|
|
||||||
|
final int lastSpace = buffer.lastIndexOf(' ');
|
||||||
|
if (lastSpace == -1) {
|
||||||
|
return cursor - buffer.length();
|
||||||
|
} else {
|
||||||
|
return cursor - (buffer.length() - lastSpace - 1);
|
||||||
|
}
|
||||||
|
} catch (ExecutionException e) {
|
||||||
|
this.server.getLogger().log(Level.WARNING, "Unhandled exception when tab completing", e);
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
Thread.currentThread().interrupt();
|
||||||
|
}
|
||||||
|
return cursor;
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user