Fix a bug with errors being cut off in weird spaces

Author: ShaneBeee

src/main/java/io/github/syst3ms/skriptparser/parsing/SyntaxParser.java

@@ -356,7 +356,7 @@ private static <T> Optional<? extends Expression<? extends T>> matchExpressionIn
      */
     public static <T> Optional<? extends Expression<? extends T>> parseListLiteral(String s, PatternType<T> expectedType, ParserState parserState, SkriptLogger logger) {
         assert !expectedType.isSingle();
-        if (!s.contains(",") && !s.contains("and") && !s.contains("nor") && !s.contains("or"))
+        if (!s.contains(",") && !s.matches(".*\\b(?:and|n?or)\\b.*"))
             return Optional.empty();
         List<String> parts = new ArrayList<>();
         var m = LIST_SPLIT_PATTERN.matcher(s);

src/main/java/io/github/syst3ms/skriptparser/pattern/ExpressionElement.java

@@ -78,15 +78,15 @@ public int match(String s, int index, MatchContext context) {
                     }
                     return -1;
                 }
-                var i = StringUtils.indexOfIgnoreCase(s, text, index);
+                var i = findTextWithBoundary(s, text.strip(), index);
                 while (i != -1) {
                     var toParse = s.substring(index, i).strip();
                     var expression = parse(toParse, typeArray, context.getParserState(), logger);
                     if (expression.isPresent()) {
                         context.addExpression(expression.get());
                         return index + toParse.length();
                     }
-                    i = StringUtils.indexOfIgnoreCase(s, text, i + 1);
+                    i = findTextWithBoundary(s, text.strip(), i + 1);
                 }
             } else if (possibleInput instanceof RegexGroup) {
                 var m = ((RegexGroup) possibleInput).getPattern().matcher(s).region(index, s.length());
@@ -225,6 +225,36 @@ public int match(String s, int index, MatchContext context) {
         return -1;
     }
 
+    /**
+     * Finds the index of text in a string, respecting word boundaries for keywords like "or", "and", "nor".
+     * @param s the string to search in
+     * @param text the text to find
+     * @param start the starting index
+     * @return the index where text was found, or -1 if not found
+     */
+    private int findTextWithBoundary(String s, String text, int start) {
+        if (text.isEmpty()) {
+            return -1;
+        }
+        // Check if this is a keyword that needs word boundary checking
+        var lowerText = text.toLowerCase();
+        var needsBoundaryCheck = lowerText.equals("or") || lowerText.equals("and") || lowerText.equals("nor");
+
+        var i = StringUtils.indexOfIgnoreCase(s, text, start);
+        while (i != -1 && needsBoundaryCheck) {
+            // Check word boundaries
+            var beforeIsWordChar = i > 0 && Character.isLetterOrDigit(s.charAt(i - 1));
+            var afterIsWordChar = (i + text.length() < s.length()) && Character.isLetterOrDigit(s.charAt(i + text.length()));
+
+            if (!beforeIsWordChar && !afterIsWordChar) {
+                return i; // Valid word boundary match
+            }
+            // Try next occurrence
+            i = StringUtils.indexOfIgnoreCase(s, text, i + 1);
+        }
+        return i;
+    }
+
     private List<String> splitAtSpaces(String s) {
         List<String> split = new ArrayList<>();
         var sb = new StringBuilder();