github-linguist 5.3.3 → 6.0.0

data/grammars/source.nesc.json

@@ -1,27 +1,21 @@
 {
-  "fileTypes": [
-    "nc",
-    "h"
-  ],
-  "firstLineMatch": "-[*]-( Mode:)? nesC -[*]-",
   "name": "nesC",
+  "scopeName": "source.nesc",
   "patterns": [
     {
       "include": "source.c"
     },
     {
-      "match": "\\b(abstract|as|async|atomic|call|command|components|configuration|event|implementation|includes|interface|generic|module|new|norace|post|provides|signal|task|uses|nx_struct)\\b",
-      "name": "keyword.control.nesc"
+      "name": "keyword.control.nesc",
+      "match": "\\b(abstract|as|async|atomic|call|command|components|configuration|event|implementation|includes|interface|generic|module|new|norace|post|provides|signal|task|uses|nx_struct)\\b"
     },
     {
-      "match": "\\b(result_t|error_t|nx_uint8_t|nx_uint16_t|nx_uint32_t|nx_int8_t|nx_int16_t|nx_int32_t|message_t|void)\\b",
-      "name": "storage.type.nesc"
+      "name": "storage.type.nesc",
+      "match": "\\b(result_t|error_t|nx_uint8_t|nx_uint16_t|nx_uint32_t|nx_int8_t|nx_int16_t|nx_int32_t|message_t|void)\\b"
     },
     {
-      "match": "\\b(SUCCESS|FAIL)\\b",
-      "name": "constant.language.nesc"
+      "name": "constant.language.nesc",
+      "match": "\\b(SUCCESS|FAIL)\\b"
     }
-  ],
-  "scopeName": "source.nesc",
-  "uuid": "3EC088FE-8C4B-4065-B895-3B32204A87C3"
-}
+  ]
+}

data/grammars/source.netlinx.erb.json

@@ -1,13 +1,6 @@
 {
-  "fileTypes": [
-    "axs.erb",
-    "axi.erb"
-  ],
-  "firstLineMatch": "-[*]-( Mode:)? C -[*]-",
-  "foldingStartMarker": "(?x)\r\n\t\t /\\*\\*(?!\\*)\r\n\t\t|^(?![^{]*?//|[^{]*?/\\*(?!.*?\\*/.*?\\{)).*?\\{\\s*($|//|/\\*(?!.*?\\*/.*\\S))\r\n\t",
-  "foldingStopMarker": "(?<!\\*)\\*\\*/|^\\s*\\}",
-  "keyEquivalent": "^~C",
   "name": "NetLinx ERB",
+  "scopeName": "source.netlinx.erb",
   "patterns": [
     {
       "include": "#erb"
@@ -18,30 +11,25 @@
   ],
   "repository": {
     "erb": {
-      "begin": "<%",
+      "name": "meta.block.netlinx.erb",
+      "begin": "\u003c%",
+      "end": "%\u003e",
+      "patterns": [
+        {
+          "include": "source.ruby"
+        },
+        {}
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.scope.netlinx.erb"
         }
       },
-      "comment": "Ruby ERB blocks nested in NetLinx code",
-      "end": "%>",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.scope.netlinx.erb"
         }
-      },
-      "name": "meta.block.netlinx.erb",
-      "patterns": [
-        {
-          "include": "source.ruby"
-        },
-        {
-          "include": "meta.define.event"
-        }
-      ]
+      }
     }
-  },
-  "scopeName": "source.netlinx.erb",
-  "uuid": "25066DC2-6B1D-11D9-9D5B-000D93589AF6"
-}
+  }
+}

data/grammars/source.netlinx.json

@@ -1,13 +1,6 @@
 {
-  "fileTypes": [
-    "axs",
-    "axi"
-  ],
-  "firstLineMatch": "-[*]-( Mode:)? C -[*]-",
-  "foldingStartMarker": "(?x)\r\n\t\t /\\*\\*(?!\\*)\r\n\t\t|^(?![^{]*?//|[^{]*?/\\*(?!.*?\\*/.*?\\{)).*?\\{\\s*($|//|/\\*(?!.*?\\*/.*\\S))\r\n\t",
-  "foldingStopMarker": "(?<!\\*)\\*\\*/|^\\s*\\}",
-  "keyEquivalent": "^~C",
   "name": "NetLinx",
+  "scopeName": "source.netlinx",
   "patterns": [
     {
       "include": "#preprocessor-rule-enabled"
@@ -22,6 +15,8 @@
       "include": "#comments"
     },
     {
+      "name": "meta.dps.netlinx",
+      "match": "(\\d{1,5})(:)(\\d{1,5})(:)(\\d{1,5})",
       "captures": {
         "1": {
           "name": "constant.numeric.dps.device.netlinx"
@@ -38,38 +33,44 @@
         "5": {
           "name": "constant.numeric.dps.system.netlinx"
         }
-      },
-      "comment": "Device Number",
-      "match": "(\\d{1,5})(:)(\\d{1,5})(:)(\\d{1,5})",
-      "name": "meta.dps.netlinx"
+      }
     },
     {
-      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b",
-      "name": "constant.numeric.netlinx"
+      "name": "constant.numeric.netlinx",
+      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b"
     },
     {
-      "comment": "hex",
-      "match": "(\\$[0-9a-fA-F]+)",
-      "name": "constant.numeric.hex.netlinx"
+      "name": "constant.numeric.hex.netlinx",
+      "match": "(\\$[0-9a-fA-F]+)"
     },
     {
+      "name": "string.quoted.single.netlinx",
       "begin": "'",
+      "end": "'",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.netlinx"
         }
       },
-      "comment": "single quoted string",
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.netlinx"
         }
-      },
-      "name": "string.quoted.single.netlinx"
+      }
     },
     {
-      "begin": "(?ix)\r\n        \t\t^\\s*(\\#(define))\\s+             # define\r\n        \t\t((?<id>[a-zA-Z_][a-zA-Z0-9_]*))  # macro name\r\n        \t\t(?:                              # and optionally:\r\n        \t\t    (\\()                         # an open parenthesis\r\n        \t\t        (\r\n        \t\t            \\s* \\g<id> \\s*       # first argument\r\n        \t\t            ((,) \\s* \\g<id> \\s*)*  # additional arguments\r\n        \t\t            (?:\\.\\.\\.)?          # varargs ellipsis?\r\n        \t\t        )\r\n        \t\t    (\\))                         # a close parenthesis\r\n        \t\t)?\r\n        \t",
+      "name": "meta.preprocessor.macro.netlinx",
+      "begin": "(?ix)\n        \t\t^\\s*(\\#(define))\\s+             # define\n        \t\t((?\u003cid\u003e[a-zA-Z_][a-zA-Z0-9_]*))  # macro name\n        \t\t(?:                              # and optionally:\n        \t\t    (\\()                         # an open parenthesis\n        \t\t        (\n        \t\t            \\s* \\g\u003cid\u003e \\s*       # first argument\n        \t\t            ((,) \\s* \\g\u003cid\u003e \\s*)*  # additional arguments\n        \t\t            (?:\\.\\.\\.)?          # varargs ellipsis?\n        \t\t        )\n        \t\t    (\\))                         # a close parenthesis\n        \t\t)?\n        \t",
+      "end": "(?=(?://|/\\*))|$",
+      "patterns": [
+        {
+          "name": "punctuation.separator.continuation.netlinx",
+          "match": "(?\u003e\\\\\\s*\\n)"
+        },
+        {
+          "include": "$base"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control.import.define.netlinx"
@@ -92,18 +93,7 @@
         "9": {
           "name": "punctuation.definition.parameters.netlinx"
         }
-      },
-      "end": "(?=(?://|/\\*))|$",
-      "name": "meta.preprocessor.macro.netlinx",
-      "patterns": [
-        {
-          "match": "(?>\\\\\\s*\\n)",
-          "name": "punctuation.separator.continuation.netlinx"
-        },
-        {
-          "include": "$base"
-        }
-      ]
+      }
     },
     {
       "include": "#pragma-mark"
@@ -113,39 +103,35 @@
     },
     {
       "begin": "(?i)\\s*\\b(define_function)\\b\\s+",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.define.netlinx"
-        }
-      },
-      "comment": "function name",
       "end": "\\)",
       "patterns": [
         {
-          "comment": "function name",
-          "match": "(?i)\\b([a-z_]\\w*)\\b(?=\\s*\\()",
-          "name": "entity.name.function.netlinx"
+          "name": "entity.name.function.netlinx",
+          "match": "(?i)\\b([a-z_]\\w*)\\b(?=\\s*\\()"
         },
         {
           "include": "#netlinx_keywords"
         },
         {
-          "comment": "type/variable pairs where type is user-defined (a struct)",
-          "match": "(?i)([a-z_][a-z0-9_]*)(?=\\s+)",
-          "name": "support.type.user.netlinx"
+          "name": "support.type.user.netlinx",
+          "match": "(?i)([a-z_][a-z0-9_]*)(?=\\s+)"
         },
         {
           "include": "#netlinx_variables"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.define.netlinx"
+        }
+      }
     },
     {
       "include": "#netlinx_keywords"
     },
     {
-      "comment": "user function names (alphanumeric before parenthesis)",
-      "match": "(?i)(?i)\\b([a-z_][a-z0-9_]*)\\b(?=\\s*\\()",
-      "name": "support.function.user.netlinx"
+      "name": "support.function.user.netlinx",
+      "match": "(?i)(?i)\\b([a-z_][a-z0-9_]*)\\b(?=\\s*\\()"
     },
     {
       "include": "#netlinx_variables"
@@ -153,13 +139,13 @@
   ],
   "repository": {
     "access": {
-      "match": "(?i)\\.[a-zA-Z_][a-zA-Z_0-9]*\\b(?!\\s*\\()",
-      "name": "variable.other.dot-access.netlinx"
+      "name": "variable.other.dot-access.netlinx",
+      "match": "(?i)\\.[a-zA-Z_][a-zA-Z_0-9]*\\b(?!\\s*\\()"
     },
     "block": {
+      "name": "meta.block.netlinx",
       "begin": "\\{",
       "end": "\\}",
-      "name": "meta.block.netlinx",
       "patterns": [
         {
           "include": "#block_innards"
@@ -184,6 +170,8 @@
           "include": "#access"
         },
         {
+          "name": "meta.initialization.netlinx",
+          "match": "(?x)\n\t\t\t        (?x)\n\t\t\t(?:\n\t\t\t     (?: (?= \\s )           (?\u003c!else|return) (?\u003c=\\w)\\s+      #  or word + space before name\n\t\t\t     )\n\t\t\t)\n\t\t\t(\n\t\t\t\t(?: [A-Za-z_][A-Za-z0-9_]*+ | :: )++    |              # actual name\n\t\t\t\t(?: (?\u003c=operator) (?: [-*\u0026\u003c\u003e=+!]+ | \\(\\) | \\[\\] ) )?  # if it is a NetLinx operator\n\t\t\t)\n\t\t\t \\s*(\\()",
           "captures": {
             "1": {
               "name": "variable.other.netlinx"
@@ -191,9 +179,7 @@
             "2": {
               "name": "punctuation.definition.parameters.netlinx"
             }
-          },
-          "match": "(?x)\r\n\t\t\t        (?x)\r\n\t\t\t(?:\r\n\t\t\t     (?: (?= \\s )           (?<!else|return) (?<=\\w)\\s+      #  or word + space before name\r\n\t\t\t     )\r\n\t\t\t)\r\n\t\t\t(\r\n\t\t\t\t(?: [A-Za-z_][A-Za-z0-9_]*+ | :: )++    |              # actual name\r\n\t\t\t\t(?: (?<=operator) (?: [-*&<>=+!]+ | \\(\\) | \\[\\] ) )?  # if it is a NetLinx operator\r\n\t\t\t)\r\n\t\t\t \\s*(\\()",
-          "name": "meta.initialization.netlinx"
+          }
         },
         {
           "include": "#block"
@@ -206,69 +192,67 @@
     "comments": {
       "patterns": [
         {
+          "name": "comment.block.netlinx",
+          "match": "^/\\* =(\\s*.*?)\\s*= \\*/$\\n?",
           "captures": {
             "1": {
               "name": "meta.toc-list.banner.block.netlinx"
             }
-          },
-          "match": "^/\\* =(\\s*.*?)\\s*= \\*/$\\n?",
-          "name": "comment.block.netlinx"
+          }
         },
         {
+          "name": "comment.block.netlinx",
           "begin": "/\\*",
+          "end": "\\*/",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.netlinx"
             }
-          },
-          "end": "\\*/",
-          "name": "comment.block.netlinx"
+          }
         },
         {
+          "name": "comment.block.netlinx",
           "begin": "\\(\\*",
+          "end": "\\*\\)",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.netlinx"
             }
-          },
-          "comment": "Netlinx parenthesis comments.",
-          "end": "\\*\\)",
-          "name": "comment.block.netlinx"
+          }
         },
         {
-          "match": "\\*/.*\\n",
-          "name": "invalid.illegal.stray-comment-end.netlinx"
+          "name": "invalid.illegal.stray-comment-end.netlinx",
+          "match": "\\*/.*\\n"
         },
         {
+          "name": "comment.line.banner.netlinx",
+          "match": "^// =(\\s*.*?)\\s*=\\s*$\\n?",
           "captures": {
             "1": {
               "name": "meta.toc-list.banner.line.netlinx"
             }
-          },
-          "match": "^// =(\\s*.*?)\\s*=\\s*$\\n?",
-          "name": "comment.line.banner.netlinx"
+          }
         },
         {
+          "name": "comment.line.double-slash.netlinx",
           "begin": "//",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.comment.netlinx"
-            }
-          },
           "end": "$\\n?",
-          "name": "comment.line.double-slash.netlinx",
           "patterns": [
             {
-              "match": "(?>\\\\\\s*\\n)",
-              "name": "punctuation.separator.continuation.netlinx"
+              "name": "punctuation.separator.continuation.netlinx",
+              "match": "(?\u003e\\\\\\s*\\n)"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.netlinx"
+            }
+          }
         }
       ]
     },
     "disabled": {
       "begin": "^\\s*#\\s*if(n?def)?\\b.*$",
-      "comment": "eat nested preprocessor if(def)s",
       "end": "^\\s*#\\s*endif\\b.*$",
       "patterns": [
         {
@@ -280,80 +264,69 @@
       ]
     },
     "dps_variables": {
+      "match": "(?i)[a-z0-9_]+\\.\\b(number|port|system)\\b",
       "captures": {
         "1": {
           "name": "support.variable.system.dps.dot-access.netlinx"
         }
-      },
-      "match": "(?i)[a-z0-9_]+\\.\\b(number|port|system)\\b"
+      }
     },
     "netlinx_constants": {
-      "match": "\\b(dv|vdv|btn|lvl|ch|adr)?([A-Z0-9_]+)\\b",
-      "name": "constant.other.netlinx"
+      "name": "constant.other.netlinx",
+      "match": "\\b(dv|vdv|btn|lvl|ch|adr)?([A-Z0-9_]+)\\b"
     },
     "netlinx_keywords": {
       "patterns": [
         {
-          "comment": "Compiler Directives",
-          "match": "(?i)(\\s*#\\b(define|disable_warning|else|end_if|if_defined|if_not_defined|include|warn)\\b)",
-          "name": "keyword.control.netlinx"
+          "name": "keyword.control.netlinx",
+          "match": "(?i)(\\s*#\\b(define|disable_warning|else|end_if|if_defined|if_not_defined|include|warn)\\b)"
         },
         {
-          "comment": "Subroutine Keywords",
-          "match": "(?i)\\b(call|define_call|system_call)\\b",
-          "name": "keyword.control.netlinx"
+          "name": "keyword.control.netlinx",
+          "match": "(?i)\\b(call|define_call|system_call)\\b"
         },
         {
-          "comment": "Array Keywords",
-          "match": "(?i)\\b(length_array|max_length_array|set_length_array)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(length_array|max_length_array|set_length_array)\\b"
         },
         {
-          "comment": "Buffer Keywords",
-          "match": "(?i)\\b(clear_buffer|create_buffer|create_multi_buffer)\\b",
-          "name": "keyword.control.netlinx"
+          "name": "keyword.control.netlinx",
+          "match": "(?i)\\b(clear_buffer|create_buffer|create_multi_buffer)\\b"
         },
         {
-          "comment": "Channel Keywords",
-          "match": "(?i)\\b(on|off|total_off)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(on|off|total_off)\\b"
         },
         {
-          "comment": "Clock Manager Keywords",
-          "match": "(?i)\\b(clkmgr_set_daylightsavings_offset|clkmgr_delete_userdefined_timeserver|clkmgr_get_active_timeserver|clkmgr_get_daylightsavings_offset|clkmgr_get_end_daylightsavings_rule|clkmgr_get_resync_period|clkmgr_get_start_daylightsavings_rule|clkmgr_get_timeservers|clkmgr_get_timezone|clkmgr_is_daylightsavings_on|clkmgr_is_network_sourced|clkmgr_set_active_timeserver|clkmgr_set_clk_source|clkmgr_set_daylightsavings_mode|clkmgr_set_daylightsavings_offset|clkmgr_set_end_daylightsavings_rule|clkmgr_set_resync_period|clkmgr_set_start_daylightsavings_rule|clkmgr_set_timezone|)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(clkmgr_set_daylightsavings_offset|clkmgr_delete_userdefined_timeserver|clkmgr_get_active_timeserver|clkmgr_get_daylightsavings_offset|clkmgr_get_end_daylightsavings_rule|clkmgr_get_resync_period|clkmgr_get_start_daylightsavings_rule|clkmgr_get_timeservers|clkmgr_get_timezone|clkmgr_is_daylightsavings_on|clkmgr_is_network_sourced|clkmgr_set_active_timeserver|clkmgr_set_clk_source|clkmgr_set_daylightsavings_mode|clkmgr_set_daylightsavings_offset|clkmgr_set_end_daylightsavings_rule|clkmgr_set_resync_period|clkmgr_set_start_daylightsavings_rule|clkmgr_set_timezone|)\\b"
         },
         {
-          "comment": "Combine/Uncombine Keywords",
-          "match": "(?i)\\b(combine_channels|combine_devices|combine_levels|uncombine_channels|uncombine_devices|uncombine_levels)\\b",
-          "name": "support.function.combine.netlinx"
+          "name": "support.function.combine.netlinx",
+          "match": "(?i)\\b(combine_channels|combine_devices|combine_levels|uncombine_channels|uncombine_devices|uncombine_levels)\\b"
         },
         {
-          "comment": "Compiler Keywords",
-          "match": "(?i)\\b(__DATE__|__FILE__|__LDATE__|__LINE__|__NAME__|__TIME__)\\b",
-          "name": "support.function.compiler.netlinx"
+          "name": "support.function.compiler.netlinx",
+          "match": "(?i)\\b(__DATE__|__FILE__|__LDATE__|__LINE__|__NAME__|__TIME__)\\b"
         },
         {
-          "comment": "Conditional and Loop Keywords",
-          "match": "(?i)\\b(break|return|default|else|for|if|include|select|active|switch|case|while|medium_while|long_while)\\b",
-          "name": "keyword.control.netlinx"
+          "name": "keyword.control.netlinx",
+          "match": "(?i)\\b(break|return|default|else|for|if|include|select|active|switch|case|while|medium_while|long_while)\\b"
         },
         {
-          "comment": "Boolean Values",
-          "match": "(?i)\\b(true|false)\\b",
-          "name": "constant.language.netlinx"
+          "name": "constant.language.netlinx",
+          "match": "(?i)\\b(true|false)\\b"
         },
         {
-          "comment": "Conversion Keywords",
-          "match": "(?i)\\b(atoi|atof|atol|ch_to_wc|ftoa|hextoi|itoa|format|itohex|raw_be|raw_le)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(atoi|atof|atol|ch_to_wc|ftoa|hextoi|itoa|format|itohex|raw_be|raw_le)\\b"
         },
         {
-          "comment": "Data Event Keywords",
-          "match": "(?i)\\b(awake|command|hold|onerror|offline|online|standby)\\b",
-          "name": "keyword.control.event.data.netlinx"
+          "name": "keyword.control.event.data.netlinx",
+          "match": "(?i)\\b(awake|command|hold|onerror|offline|online|standby)\\b"
         },
         {
+          "match": "(?i)\\b(char|widechar|integer|sinteger|long|slong|float|double|dev|devchan)\\b\\s+([a-z_]\\w*)\\b(?!\\()",
           "captures": {
             "1": {
               "name": "support.type.system.netlinx"
@@ -361,134 +334,107 @@
             "2": {
               "name": "support.variable.system.netlinx"
             }
-          },
-          "comment": "Data Type Keywords",
-          "match": "(?i)\\b(char|widechar|integer|sinteger|long|slong|float|double|dev|devchan)\\b\\s+([a-z_]\\w*)\\b(?!\\()"
+          }
         },
         {
-          "comment": "Data Type Keywords",
-          "match": "(?i)\\b(char|widechar|integer|sinteger|long|slong|float|double|dev|devchan)\\b",
-          "name": "support.type.system.netlinx"
+          "name": "support.type.system.netlinx",
+          "match": "(?i)\\b(char|widechar|integer|sinteger|long|slong|float|double|dev|devchan)\\b"
         },
         {
-          "comment": "Device Keywords",
-          "match": "(?i)\\b(device_id|device_id_string|device_info|device_standby|device_wake|dynamic_application_device|master_slot|master_sn|reboot|send_command|system_number)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(device_id|device_id_string|device_info|device_standby|device_wake|dynamic_application_device|master_slot|master_sn|reboot|send_command|system_number)\\b"
         },
         {
-          "comment": "Encode/Decode Keywords",
-          "match": "(?i)\\b(length_variable_to_string|variable_to_xml|xml_to_variable|length_variable_to_xml)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(length_variable_to_string|variable_to_xml|xml_to_variable|length_variable_to_xml)\\b"
         },
         {
-          "comment": "Event Handler Keywords",
-          "match": "(?i)\\b(button_event|channel_event|data_event|level_event|rebuild_event)\\b",
-          "name": "keyword.control.event.netlinx"
+          "name": "keyword.control.event.netlinx",
+          "match": "(?i)\\b(button_event|channel_event|data_event|level_event|rebuild_event)\\b"
         },
         {
-          "comment": "File Operation Keywords",
-          "match": "(?i)\\b(file_close|file_copy|file_createdir|file_delete|file_dir|file_getdir|file_open|file_read|file_read_line|file_removedir|file_rename|file_seek|file_setdir|file_write|file_write_line)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(file_close|file_copy|file_createdir|file_delete|file_dir|file_getdir|file_open|file_read|file_read_line|file_removedir|file_rename|file_seek|file_setdir|file_write|file_write_line)\\b"
         },
         {
-          "comment": "Get Keywords",
-          "match": "(?i)\\b(get_last|get_multi_buffer_string|get_pulse_time|get_serial_number|get_system_number|get_timer|get_unique_id|get_url_list)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(get_last|get_multi_buffer_string|get_pulse_time|get_serial_number|get_system_number|get_timer|get_unique_id|get_url_list)\\b"
         },
         {
-          "comment": "IP Keywords",
-          "match": "(?i)\\b(add_url_entry|delete_url_entry|get_dns_list|get_ip_address|ip_bound_client_open|ip_client_close|ip_client_open|ip_mc_server_open|ip_server_close|ip_server_open|ip_set_option|set_ip_address|set_dns_list)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(add_url_entry|delete_url_entry|get_dns_list|get_ip_address|ip_bound_client_open|ip_client_close|ip_client_open|ip_mc_server_open|ip_server_close|ip_server_open|ip_set_option|set_ip_address|set_dns_list)\\b"
         },
         {
-          "comment": "Level Keywords",
-          "match": "(?i)\\b(~levsyncon|~levsyncoff|create_level|send_level|set_virtual_level_count)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(~levsyncon|~levsyncoff|create_level|send_level|set_virtual_level_count)\\b"
         },
         {
-          "comment": "Log Keywords",
-          "match": "(?i)\\b(set_log_level|get_log_level|amx_log)\\b",
-          "name": "support.function.log.netlinx"
+          "name": "support.function.log.netlinx",
+          "match": "(?i)\\b(set_log_level|get_log_level|amx_log)\\b"
         },
         {
-          "comment": "Math Functions",
-          "match": "(?i)\\b(exp_value|log_value|log10_value|power_value|sqrt_value)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(exp_value|log_value|log10_value|power_value|sqrt_value)\\b"
         },
         {
-          "comment": "Module Keywords",
-          "match": "(?i)\\b(duet_mem_size_get|duet_mem_size_set|module_name)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(duet_mem_size_get|duet_mem_size_set|module_name)\\b"
         },
         {
-          "comment": "Operator Keywords",
-          "match": "(\\&|~|\\||\\^|<|\\%|\\!|>|=|\\\")",
-          "name": "keyword.operator.netlinx"
+          "name": "keyword.operator.netlinx",
+          "match": "(\\\u0026|~|\\||\\^|\u003c|\\%|\\!|\u003e|=|\\\")"
         },
         {
-          "comment": "Port Keywords",
-          "match": "(?i)\\b(dynamic_polled_port|first_local_port|static_port_binding)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(dynamic_polled_port|first_local_port|static_port_binding)\\b"
         },
         {
-          "comment": "Push And Release Control Keywords",
-          "match": "(?i)\\b(push|release)\\b",
-          "name": "keyword.control.netlinx"
+          "name": "keyword.control.netlinx",
+          "match": "(?i)\\b(push|release)\\b"
         },
         {
-          "comment": "Push And Release Keywords",
-          "match": "(?i)\\b(repeat|do_push|do_push_timed|do_release|min_to|push|push_channel|push_devchan|push_device|release|release_channel|release_devchan|release_device|to)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(repeat|do_push|do_push_timed|do_release|min_to|push|push_channel|push_devchan|push_device|release|release_channel|release_devchan|release_device|to)\\b"
         },
         {
-          "comment": "Set Keywords",
-          "match": "(?i)\\b(set_outdoor_temperature|set_pulse_time|pulse|set_system_number|set_timer|set_virtual_channel_count|set_virtual_port_count)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(set_outdoor_temperature|set_pulse_time|pulse|set_system_number|set_timer|set_virtual_channel_count|set_virtual_port_count)\\b"
         },
         {
-          "comment": "SMTP Keywords",
-          "match": "(?i)\\b(smtp_server_config_set|smtp_server_config_get|smtp_send)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(smtp_server_config_set|smtp_server_config_get|smtp_send)\\b"
         },
         {
-          "comment": "String Keywords",
-          "match": "(?i)\\b(chard|chardm|compare_string|find_string|left_string|length_string|lower_string|max_length_string|mid_string|redirect_string|remove_string|right_string|send_string|set_length_string|string|string_to_variable|upper_string|variable_to_string)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(chard|chardm|compare_string|find_string|left_string|length_string|lower_string|max_length_string|mid_string|redirect_string|remove_string|right_string|send_string|set_length_string|string|string_to_variable|upper_string|variable_to_string)\\b"
         },
         {
-          "comment": "Structure Keywords",
-          "match": "(?i)\\b(struct|structure)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(struct|structure)\\b"
         },
         {
-          "comment": "Time And Date Keywords",
-          "match": "(?i)\\b(astro_clock|clock|date|date_to_day|date_to_month|date_to_year|day|day_of_week|ldate|time|time_to_hour|time_to_minute|time_to_second)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(astro_clock|clock|date|date_to_day|date_to_month|date_to_year|day|day_of_week|ldate|time|time_to_hour|time_to_minute|time_to_second)\\b"
         },
         {
-          "comment": "Timeline Keywords",
-          "match": "(?i)\\b(timeline_active|timeline_create|timeline_event|timeline_get|timeline_kill|timeline_pause|timeline_reload|timeline_restart|timeline_set)\\b",
-          "name": "support.function.timeline.netlinx"
+          "name": "support.function.timeline.netlinx",
+          "match": "(?i)\\b(timeline_active|timeline_create|timeline_event|timeline_get|timeline_kill|timeline_pause|timeline_reload|timeline_restart|timeline_set)\\b"
         },
         {
-          "comment": "Unicode Keywords",
-          "match": "(?i)\\b(_wc|wc_compare_string|wc_concat_string|wc_decode|wc_encode|wc_file_close|wc_file_open|wc_file_read|wc_file_read_line|wc_file_write|wc_file_write_line|wc_find_string|wc_get_buffer_char|wc_get_buffer_string|wc_left_string|wc_length_string|wc_lower_string|wc_max_length_string|wc_mid_string|wc_remove_string|wc_right_string|wc_set_length_string|wc_to_ch|wc_tp_encode|wc_upper_string)\\b",
-          "name": "support.function.netlinx"
+          "name": "support.function.netlinx",
+          "match": "(?i)\\b(_wc|wc_compare_string|wc_concat_string|wc_decode|wc_encode|wc_file_close|wc_file_open|wc_file_read|wc_file_read_line|wc_file_write|wc_file_write_line|wc_find_string|wc_get_buffer_char|wc_get_buffer_string|wc_left_string|wc_length_string|wc_lower_string|wc_max_length_string|wc_mid_string|wc_remove_string|wc_right_string|wc_set_length_string|wc_to_ch|wc_tp_encode|wc_upper_string)\\b"
         },
         {
-          "comment": "Variables Keywords",
-          "match": "(?i)\\b(abs_value|max_value|min_value|random_number|type_cast)\\b",
-          "name": "support.function.variable.netlinx"
+          "name": "support.function.variable.netlinx",
+          "match": "(?i)\\b(abs_value|max_value|min_value|random_number|type_cast)\\b"
         },
         {
-          "comment": "Variable Modifiers",
-          "match": "(?i)\\b(constant|non_volatile|persistent|local_var|stack_var|volatile)\\b",
-          "name": "storage.modifier.netlinx"
+          "name": "storage.modifier.netlinx",
+          "match": "(?i)\\b(constant|non_volatile|persistent|local_var|stack_var|volatile)\\b"
         },
         {
-          "comment": "Wait Keywords",
-          "match": "(?i)\\b(cancel_all_wait|cancel_all_wait_until|cancel_wait|cancel_wait_until|pause_all_wait|pause_wait|restart_all_wait|restart_wait|wait|wait_until|timed_wait_until)\\b",
-          "name": "support.function.wait.netlinx"
+          "name": "support.function.wait.netlinx",
+          "match": "(?i)\\b(cancel_all_wait|cancel_all_wait_until|cancel_wait|cancel_wait_until|pause_all_wait|pause_wait|restart_all_wait|restart_wait|wait|wait_until|timed_wait_until)\\b"
         },
         {
           "include": "#dps_variables"
@@ -499,14 +445,13 @@
       ]
     },
     "netlinx_variables": {
-      "comment": "Variables (every word not matched)",
-      "match": "\\w+",
-      "name": "variable.other.netlinx"
+      "name": "variable.other.netlinx",
+      "match": "\\w+"
     },
     "parens": {
+      "name": "meta.parens.netlinx",
       "begin": "\\(",
       "end": "\\)",
-      "name": "meta.parens.netlinx",
       "patterns": [
         {
           "include": "$base"
@@ -514,6 +459,8 @@
       ]
     },
     "pragma-mark": {
+      "name": "meta.section",
+      "match": "^\\s*(#\\s*(pragma\\s+mark)\\s+(.*))",
       "captures": {
         "1": {
           "name": "meta.preprocessor.netlinx"
@@ -524,27 +471,20 @@
         "3": {
           "name": "meta.toc-list.pragma-mark.netlinx"
         }
-      },
-      "match": "^\\s*(#\\s*(pragma\\s+mark)\\s+(.*))",
-      "name": "meta.section"
+      }
     },
     "preprocessor-rule-disabled": {
       "begin": "^\\s*(#(if)\\s+(0)\\b).*",
-      "captures": {
-        "1": {
-          "name": "meta.preprocessor.netlinx"
-        },
-        "2": {
-          "name": "keyword.control.import.if.netlinx"
-        },
-        "3": {
-          "name": "constant.numeric.preprocessor.netlinx"
-        }
-      },
       "end": "^\\s*(#\\s*(endif)\\b)",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b)",
+          "end": "(?=^\\s*#\\s*endif\\b.*$)",
+          "patterns": [
+            {
+              "include": "$base"
+            }
+          ],
           "captures": {
             "1": {
               "name": "meta.preprocessor.netlinx"
@@ -552,18 +492,11 @@
             "2": {
               "name": "keyword.control.import.else.netlinx"
             }
-          },
-          "end": "(?=^\\s*#\\s*endif\\b.*$)",
-          "patterns": [
-            {
-              "include": "$base"
-            }
-          ]
+          }
         },
         {
-          "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
           "name": "comment.block.preprocessor.if-branch",
+          "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
           "patterns": [
             {
               "include": "#disabled"
@@ -573,10 +506,7 @@
             }
           ]
         }
-      ]
-    },
-    "preprocessor-rule-disabled-block": {
-      "begin": "^\\s*(#(if)\\s+(0)\\b).*",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.netlinx"
@@ -587,11 +517,20 @@
         "3": {
           "name": "constant.numeric.preprocessor.netlinx"
         }
-      },
+      }
+    },
+    "preprocessor-rule-disabled-block": {
+      "begin": "^\\s*(#(if)\\s+(0)\\b).*",
       "end": "^\\s*(#\\s*(endif)\\b)",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b)",
+          "end": "(?=^\\s*#\\s*endif\\b.*$)",
+          "patterns": [
+            {
+              "include": "#block_innards"
+            }
+          ],
           "captures": {
             "1": {
               "name": "meta.preprocessor.netlinx"
@@ -599,18 +538,11 @@
             "2": {
               "name": "keyword.control.import.else.netlinx"
             }
-          },
-          "end": "(?=^\\s*#\\s*endif\\b.*$)",
-          "patterns": [
-            {
-              "include": "#block_innards"
-            }
-          ]
+          }
         },
         {
-          "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
           "name": "comment.block.preprocessor.if-branch.in-block",
+          "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
           "patterns": [
             {
               "include": "#disabled"
@@ -620,10 +552,7 @@
             }
           ]
         }
-      ]
-    },
-    "preprocessor-rule-enabled": {
-      "begin": "^\\s*(#(if)\\s+(0*1)\\b)",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.netlinx"
@@ -634,20 +563,15 @@
         "3": {
           "name": "constant.numeric.preprocessor.netlinx"
         }
-      },
+      }
+    },
+    "preprocessor-rule-enabled": {
+      "begin": "^\\s*(#(if)\\s+(0*1)\\b)",
       "end": "^\\s*(#\\s*(endif)\\b)",
       "patterns": [
         {
-          "begin": "^\\s*(#\\s*(else)\\b).*",
-          "captures": {
-            "1": {
-              "name": "meta.preprocessor.netlinx"
-            },
-            "2": {
-              "name": "keyword.control.import.else.netlinx"
-            }
-          },
           "contentName": "comment.block.preprocessor.else-branch",
+          "begin": "^\\s*(#\\s*(else)\\b).*",
           "end": "(?=^\\s*#\\s*endif\\b.*$)",
           "patterns": [
             {
@@ -656,10 +580,17 @@
             {
               "include": "#pragma-mark"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "meta.preprocessor.netlinx"
+            },
+            "2": {
+              "name": "keyword.control.import.else.netlinx"
+            }
+          }
         },
         {
-          "begin": "",
           "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
           "patterns": [
             {
@@ -667,10 +598,7 @@
             }
           ]
         }
-      ]
-    },
-    "preprocessor-rule-enabled-block": {
-      "begin": "^\\s*(#(if)\\s+(0*1)\\b)",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.netlinx"
@@ -681,20 +609,15 @@
         "3": {
           "name": "constant.numeric.preprocessor.netlinx"
         }
-      },
+      }
+    },
+    "preprocessor-rule-enabled-block": {
+      "begin": "^\\s*(#(if)\\s+(0*1)\\b)",
       "end": "^\\s*(#\\s*(endif)\\b)",
       "patterns": [
         {
-          "begin": "^\\s*(#\\s*(else)\\b).*",
-          "captures": {
-            "1": {
-              "name": "meta.preprocessor.netlinx"
-            },
-            "2": {
-              "name": "keyword.control.import.else.netlinx"
-            }
-          },
           "contentName": "comment.block.preprocessor.else-branch.in-block",
+          "begin": "^\\s*(#\\s*(else)\\b).*",
           "end": "(?=^\\s*#\\s*endif\\b.*$)",
           "patterns": [
             {
@@ -703,10 +626,17 @@
             {
               "include": "#pragma-mark"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "meta.preprocessor.netlinx"
+            },
+            "2": {
+              "name": "keyword.control.import.else.netlinx"
+            }
+          }
         },
         {
-          "begin": "",
           "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
           "patterns": [
             {
@@ -714,27 +644,27 @@
             }
           ]
         }
-      ]
-    },
-    "preprocessor-rule-other": {
-      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.netlinx"
         },
         "2": {
-          "name": "keyword.control.import.netlinx"
+          "name": "keyword.control.import.if.netlinx"
+        },
+        "3": {
+          "name": "constant.numeric.preprocessor.netlinx"
         }
-      },
+      }
+    },
+    "preprocessor-rule-other": {
+      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
       "end": "^\\s*(#\\s*(endif)\\b).*$",
       "patterns": [
         {
           "include": "$base"
         }
-      ]
-    },
-    "preprocessor-rule-other-block": {
-      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.netlinx"
@@ -742,27 +672,36 @@
         "2": {
           "name": "keyword.control.import.netlinx"
         }
-      },
+      }
+    },
+    "preprocessor-rule-other-block": {
+      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
       "end": "^\\s*(#\\s*(endif)\\b).*$",
       "patterns": [
         {
           "include": "#block_innards"
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "meta.preprocessor.netlinx"
+        },
+        "2": {
+          "name": "keyword.control.import.netlinx"
+        }
+      }
     },
     "string_placeholder": {
       "patterns": [
         {
-          "match": "(?x)%\r\n    \t\t\t\t\t\t(\\d+\\$)?                             # field (argument #)\r\n    \t\t\t\t\t\t[#0\\- +']*                           # flags\r\n    \t\t\t\t\t\t[,;:_]?                              # separator character (AltiVec)\r\n    \t\t\t\t\t\t((-?\\d+)|\\*(-?\\d+\\$)?)?              # minimum field width\r\n    \t\t\t\t\t\t(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?         # precision\r\n    \t\t\t\t\t\t(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)? # length modifier\r\n    \t\t\t\t\t\t[diouxXDOUeEfFgGaACcSspn%]           # conversion type\r\n    \t\t\t\t\t",
-          "name": "constant.other.placeholder.netlinx"
+          "name": "constant.other.placeholder.netlinx",
+          "match": "(?x)%\n    \t\t\t\t\t\t(\\d+\\$)?                             # field (argument #)\n    \t\t\t\t\t\t[#0\\- +']*                           # flags\n    \t\t\t\t\t\t[,;:_]?                              # separator character (AltiVec)\n    \t\t\t\t\t\t((-?\\d+)|\\*(-?\\d+\\$)?)?              # minimum field width\n    \t\t\t\t\t\t(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?         # precision\n    \t\t\t\t\t\t(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)? # length modifier\n    \t\t\t\t\t\t[diouxXDOUeEfFgGaACcSspn%]           # conversion type\n    \t\t\t\t\t"
         },
         {
-          "match": "%",
-          "name": "invalid.illegal.placeholder.netlinx"
+          "name": "invalid.illegal.placeholder.netlinx",
+          "match": "%"
         }
       ]
     }
-  },
-  "scopeName": "source.netlinx",
-  "uuid": "25066DC2-6B1D-11D9-9D5B-000D93589AF6"
-}
+  }
+}