fix(tsl): parser fails to parse hexcode

iGoodie · Sep 13, 2020 · e6843fa · e6843fa
1 parent 7cd2474
commit e6843fa
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/main/java/net/programmer/igoodie/twitchspawn/tslanguage/parser/TSLTokenizer.java b/src/main/java/net/programmer/igoodie/twitchspawn/tslanguage/parser/TSLTokenizer.java
@@ -211,12 +211,13 @@ private String trimComments(String line) {
 
         boolean escaping = false;
         boolean inGroup = false;
+        boolean inJsonString = false;
 
         for (char character : line.toCharArray()) {
 
             // Comment character
             if (character == COMMENT) {
-                if (!inGroup)
+                if (!inGroup && !inJsonString)
                     break;
             }
 
@@ -226,6 +227,12 @@ private String trimComments(String line) {
                     inGroup = !inGroup;
             }
 
+            // Json String
+            if (character == '"' || character == '\'') {
+                if (!escaping)
+                    inJsonString = !inJsonString;
+            }
+
             // Escape character
             if (character == ESCAPE) {
                 escaping = !escaping;