Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tabcomplete for random pattern / multiple pattern (#1675)

Browse Source 
* Merge RandomPatternParser#getSuggestions with upstream

* fix: don't throw AIIBE if patterns are empty

shouldn't be the case in the first place
This commit is contained in:
Pierre Maurice Schwang 2022-03-27 09:46:36 +02:00 committed by GitHub
parent 465c81d193
commit d1588f9207
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/pattern/RandomPatternParser.java
View File

@ -30,34 +30,23 @@ public class RandomPatternParser extends InputParser<Pattern> {
public Stream<String> getSuggestions(String input) { public Stream<String> getSuggestions(String input) {
//FAWE start //FAWE start
List<String> patterns = StringUtil.split(input, ',', '[', ']'); List<String> patterns = StringUtil.split(input, ',', '[', ']');
if (patterns.size() == 0) { if (patterns.isEmpty()) {
return Stream.empty(); return Stream.empty();
} }
// get suggestions for the last token only
String token = patterns.get(patterns.size() - 1);
String percent;
String previous;
if (patterns.size() != 1) {
previous = String.join(",", patterns.subList(0, patterns.size() - 1));
percent = ",";
} else {
previous = "";
percent = "";
}
if (regex.matcher(token).matches()) {
String[] p = token.split("%");
if (p.length < 2) {
return Stream.empty();
} else {
percent += p[0] + "%";
token = p[1];
}
} else {
return Stream.empty();
}
final List<String> innerSuggestions = worldEdit.getPatternFactory().getSuggestions(token);
String prefix = previous + percent;
//FAWE end //FAWE end
// get suggestions for the last token only
String percent = null;
String token = patterns.get(patterns.size() - 1);
if (regex.matcher(token).matches()) {
String[] p = token.split("%", 2);
percent = p[0];
token = p[1];
} else if (patterns.size() == 1) {
return Stream.empty(); // handled by DefaultBlockParser
}
String previous = patterns.size() == 1 ? "" : String.join(",", patterns.subList(0, patterns.size() - 1)) + ",";
String prefix = previous + (percent == null ? "" : percent + "%");
final List<String> innerSuggestions = worldEdit.getPatternFactory().getSuggestions(token);
return innerSuggestions.stream().map(s -> prefix + s); return innerSuggestions.stream().map(s -> prefix + s);
} }