Skip to content

Prioritize Skript syntax when parsing #8145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 30, 2025
Merged

Prioritize Skript syntax when parsing #8145

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1993a58
Prioritize Skript syntax
APickledWalrus Aug 22, 2025
331903c
Merge branch 'dev/patch' into patch/more-syntax-ordering
sovdeeth Aug 28, 2025
ce12761
Merge branch 'dev/patch' into patch/more-syntax-ordering
sovdeeth Aug 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/main/java/org/skriptlang/skript/registration/SyntaxRegister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
*/
final class SyntaxRegister<I extends SyntaxInfo<?>> {

private static boolean isSkriptSyntax(SyntaxInfo<?> info) {
String originName = info.origin().name();
// name will either be generic Skript instance name or class name
// TODO something more reliable
return originName.equals("Skript") || originName.startsWith("org.skriptlang.skript");
}

private static int calculateComplexityScore(SyntaxInfo<?> info) {
return info.patterns().stream()
.mapToInt(SyntaxRegister::calculateComplexityScore)
Expand All @@ -26,9 +33,9 @@ private static int calculateComplexityScore(String pattern) {
char[] chars = pattern.toCharArray();
for (int i = 0; i < chars.length; i++) {
if (chars[i] == '%') {
// weigh "%thing% %thing%" or "%thing% [%thing%]" heavier
// weigh "%thing% %thing%" or "%thing% [%thing%]" much heavier
if ((i - 2 >= 0 && chars[i - 2] == '%') || (i - 3 >= 0 && chars[i - 3] == '%')) {
score += 3;
score += 5;
} else {
score++;
}
Expand All @@ -46,6 +53,12 @@ private static int calculateComplexityScore(String pattern) {
if (priorityResult != 0) {
return priorityResult;
}
// prioritize Skript syntax over its addons
if (isSkriptSyntax(a) && !isSkriptSyntax(b)) {
return -1;
} else if (!isSkriptSyntax(a) && isSkriptSyntax(b)) {
return 1;
}
// otherwise, consider the complexity of the syntax
int scoreResult = Integer.compare(calculateComplexityScore(a), calculateComplexityScore(b));
if (scoreResult != 0) {
Expand Down