Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-19 10:25:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with spaces at end of suggestions.

Browse Source
This commit is contained in:
Kenzie Togami 2019-08-08 16:28:00 -07:00
parent 0e25839490
commit f83de2a703
No known key found for this signature in database
GPG Key ID: 5D200B325E157A81
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/CommandUtil.java
View File

@ -70,14 +70,18 @@ public class CommandUtil {
); );
return suggestions.stream() return suggestions.stream()
// Re-map suggestions to only operate on the last non-quoted word // Re-map suggestions to only operate on the last non-quoted word
.map(CommandUtil::onlyOnLastQuotedWord) .map(suggestion -> onlyOnLastQuotedWord(lastArg, suggestion))
.map(suggestion -> CommandUtil.suggestLast(lastArg, suggestion)) .map(suggestion -> suggestLast(lastArg, suggestion))
.filter(Optional::isPresent) .filter(Optional::isPresent)
.map(Optional::get) .map(Optional::get)
.collect(toList()); .collect(toList());
} }
private static Substring onlyOnLastQuotedWord(Substring suggestion) { private static Substring onlyOnLastQuotedWord(Substring lastArg, Substring suggestion) {
if (suggestion.getSubstring().startsWith(lastArg.getSubstring())) {
// This is already fine.
return suggestion;
}
String substr = suggestion.getSubstring(); String substr = suggestion.getSubstring();
int sp = substr.lastIndexOf(' '); int sp = substr.lastIndexOf(' ');
if (sp < 0) { if (sp < 0) {

8
worldedit-core/src/main/java/com/sk89q/worldedit/internal/util/Substring.java
View File

@ -21,6 +21,8 @@ package com.sk89q.worldedit.internal.util;
import java.util.Objects; import java.util.Objects;
import static com.google.common.base.Preconditions.checkArgument;
/** /**
* An explicit substring. Provides the range from which it was taken. * An explicit substring. Provides the range from which it was taken.
*/ */
@ -31,7 +33,7 @@ public final class Substring {
* a Substring. * a Substring.
*/ */
public static Substring from(String original, int start) { public static Substring from(String original, int start) {
return wrap(original.substring(start), start, original.length()); return new Substring(original.substring(start), start, original.length());
} }
/** /**
@ -39,13 +41,15 @@ public final class Substring {
* a Substring. * a Substring.
*/ */
public static Substring from(String original, int start, int end) { public static Substring from(String original, int start, int end) {
return wrap(original.substring(start, end), start, end); return new Substring(original.substring(start, end), start, end);
} }
/** /**
* Wrap the given parameters into a Substring instance. * Wrap the given parameters into a Substring instance.
*/ */
public static Substring wrap(String substring, int start, int end) { public static Substring wrap(String substring, int start, int end) {
checkArgument(0 <= start, "Start must be greater than or equal to zero");
checkArgument(start <= end, "End must be greater than or equal to start");
return new Substring(substring, start, end); return new Substring(substring, start, end);
} }