remove unrelated commits

sorry i add some commits from another PR in this branch, it was a mistake

Author: WeeskyBDW

src/main/java/io/github/syst3ms/skriptparser/file/FileParser.java

@@ -16,6 +16,9 @@
 public class FileParser {
     public static final Pattern LINE_PATTERN = Pattern.compile("^((?:[^#]|##)*)(\\s*#(?!#).*)$"); // Might as well take that from Skript
 
+    // 0 = not in a comment, 1 = in a one-line comment, 2 = in a block comment
+    private static int COMMENT_STATUS = 0;
+
     /**
      * Parses a {@linkplain List} of strings into a list of {@link FileElement}s. This creates {@link FileElement} and
      * {@link FileSection} objects from the lines, effectively structuring the lines into a tree.
@@ -34,9 +37,7 @@ public static List<FileElement> parseFileLines(String fileName, List<String> lin
             var line = lines.get(i);
             String content = removeComments(line);
 
-            if (content == null) {
-                content = line.replace("##", "#").strip();
-            } else if (content.isEmpty()) {
+            if (content.isEmpty()) {
                 elements.add(new VoidElement(fileName, lastLine + i, expectedIndentation));
                 continue;
             }
@@ -92,39 +93,36 @@ private static int count(List<FileElement> elements) {
      */
     @Nullable
     private static String removeComments(String string) {
-        if (string.matches("^[\\s\\t]*#[^#]+") || string.startsWith("#") || string.isBlank()) {
-            return ""; // Whole string is a comment
-        }
-
-        var builder = new StringBuilder();
-        outer:
+        StringBuilder stringBuilder = new StringBuilder();
         for (int i = 0; i < string.length(); i++) {
             char c = string.charAt(i);
-
             if (c == '#') {
-                if (string.charAt(i + 1) == '#') {
-                    builder.append(c).append(string.charAt(++i));
-                } else {
-                    var checked = string.substring(i + 1);
-                    for (int j : new int[] {3, 6, 8}) {
-                        if (checked.length() >= j
-                                && Color.COLOR_PATTERN.matcher(checked.substring(0, j)).matches()) {
-                            builder.append(c).append(checked, 0, j);
-                            i+=j;
-                            continue outer;
-                        }
+                if (i + 1 >= string.length()) return "";
+                if (COMMENT_STATUS == 0) {
+                    //Checking if it isn't color hex and if no double # (for escaping first #)
+                    for (int j : new int[]{3, 6, 9}) {
+                        if (i + j <= string.length() - 1 && !Color.COLOR_PATTERN.matcher(string.substring(i +1, i + j)).matches())
+                            COMMENT_STATUS = 1;
                     }
+                }
 
-                    // Comment was found. Erase it from the string
-                    assert !builder.toString().isEmpty();
-                    return builder.toString().strip();
+                if (i + 3 <= string.length()) {
+                    //set start or end of a block comment ("###" characters)
+                    if (string.substring(i, i + 3).equals("###"))
+                        COMMENT_STATUS = COMMENT_STATUS == 2 ? 0 : 2;
+                    else if (string.substring(i, i + 2).equals("##"))
+                        COMMENT_STATUS = 0;
+                        i += 2;
                 }
-            } else {
-                builder.append(c);
+
+            }
+            if (COMMENT_STATUS == 0) {
+                stringBuilder.append(c);
             }
         }
-        if (builder.toString().equals(string))
-            return null;
-        return builder.toString().strip();
+        if (COMMENT_STATUS == 1) COMMENT_STATUS = 0;
+        return stringBuilder.toString().strip();
+
     }
+
 }