Fix SINUMERIK840D IF handling (#638)

facelessuser · Nov 4, 2024 · a0eb7bd · a0eb7bd
1 parent d51872e
commit a0eb7bd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,10 @@
 # BracketHighlighter
 
+## 2.32.0
+
+- **NEW**: Opt in to Python 3.8.
+- **FIX**: Fix issues with "SINUMERIK840D" language.
+
 ## 2.31.5
 
 - **FIX**: Fix endless Ruby method case.

diff --git a/bh_core.sublime-settings b/bh_core.sublime-settings
@@ -663,7 +663,7 @@
         {
             "name": "s840d_hmi",
             "open": "^\\s*(//[ABGMS]|ACTIVATE|CHANGE|FOCUS|IF|LOAD|UNLOAD|OUTPUT|PRESS|SUB)\\b",
-            "close": "^\\s*(//END|END_(?:ACTIVATE|CHANGE|FOCUS|IF|LOAD|UNLOAD|OUTPUT|PRESS|SUB))\\b",
+            "close": "^\\s*(//END|END_(?:ACTIVATE|CHANGE|FOCUS|LOAD|UNLOAD|OUTPUT|PRESS|SUB)|END(?:IF))\\b",
             "style": "tag",
             "scope_exclude": ["string", "comment"],
             "plugin_library": "bh_modules.s840d_hmi",

diff --git a/bh_modules/s840d_hmi.py b/bh_modules/s840d_hmi.py
@@ -19,6 +19,6 @@ def compare(name, first, second, bfr):
     if o in S840D_HMI_CLASSES and c == "//end":
         match = True
     # methods
-    elif c == "end_" + o:
+    elif c == "end_" + o or c == 'end' + o:
         match = True
     return match
diff --git a/support.py b/support.py
@@ -5,7 +5,7 @@
 import webbrowser
 import re
 
-__version__ = "2.31.5"
+__version__ = "2.32.0"
 __pc_name__ = 'BracketHighlighter'
 
 CSS = '''