Fix some more bugs in the minify regexes

klaashoekstra94 · Feb 12, 2024 · 1a7c1ce · 1a7c1ce
1 parent 7f72707
commit 1a7c1ce
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/heishamon_rules_minify/minifier.py b/src/heishamon_rules_minify/minifier.py
@@ -40,7 +40,7 @@ def minify(cls, input_text):
         found_functions = cls._remove_lowercase(found_functions)
 
         for k, v in found_variables.items():
-            text = re.sub(rf"(?<=\B[#$]){k}(?=[= &|<>\-+%*\/^);,])", v, text)
+            text = re.sub(rf"(?<=\B[#$]){k}(?=[= &|<>\-+%*\/^!);,])", v, text)
 
         for k, v in found_functions.items():
             text = re.sub(rf"{k}(?= then|\()", v, text)
@@ -49,7 +49,7 @@ def minify(cls, input_text):
         text = re.sub(r"^(?:[\t ]*(?:\r?\n|\r))+", "", text, flags=re.MULTILINE)
 
         # Remove spaces and tabs at beginning and end of lines
-        text = re.sub(r"^[\t| ]+|[\t| ]+$", "", text, flags=re.MULTILINE)
+        text = re.sub(r"^[\t ]+|[\t ]+$", "", text, flags=re.MULTILINE)
 
         # Remove newline after line ending with 'then' or 'else'
         text = re.sub(r"(?<=then|else)\r?\n", " ", text, flags=re.MULTILINE)
@@ -58,14 +58,19 @@ def minify(cls, input_text):
         text = re.sub(r"(?<=[;=&|<>\-+%*\/^()])\r?\n", "", text, flags=re.MULTILINE)
 
         # Remove extra spaces that are present after removing newlines
-        text = re.sub(r"(?<=[;=&|<>\-+%*\/^()]) *(?=\S)(?!then)", "", text, flags=re.MULTILINE)
+        text = re.sub(r"(?<=[;=&|<>\-+%*\/^()])[\t ]*(?=\S)(?!then)", "", text, flags=re.MULTILINE)
 
         # Remove newline after line ending with 'end', except for last end of function
         text = re.sub(r"(?<=end)\s+(?!\s*on |\Z)", " ", text, flags=re.MULTILINE)
 
         # Correct spaces around operators and functions
-        text = re.sub(r"(?<!timer)( *(==|!=|>=|<=|\|\||&&|[=+\*\/<>^]) *)(?=-?\d|\b|[(#$@%?].+(;|then|end))", r" \g<2> ", text, flags=re.MULTILINE)
-        text = re.sub(r"(?<!=)(?<!= ) *- *(?=-*\d|[(#$@%?].+(;|then|end))", " - ", text, flags=re.MULTILINE)
+        text = re.sub(
+            r"(?<!timer)( *(==|!=|>=|<=|\|\||&&|[=+\*\/<>^]) *)(?=-?\d|\b|[(#$@%?].+(;|then|end))",
+            r" \g<2> ",
+            text,
+            flags=re.MULTILINE,
+        )
+        text = re.sub(r"(?<![=<>(,])(?<![=<>(,] ) *- *(?=-*\d|[(#$@%?].+(;|then|end))", " - ", text, flags=re.MULTILINE)
         text = re.sub(r" *% *(?=-*\d|[(#$@%?].+(;|then|end))", " % ", text, flags=re.MULTILINE)
 
         # Remove all spaces around comma signs