github-linguist 5.3.3 → 6.0.0

data/grammars/source.rexx.json

@@ -1,59 +1,52 @@
 {
-  "fileTypes": [
-    "rex"
-  ],
-  "firstLineMatch": "/\\*.*(?i:REXX)\\b",
-  "foldingStartMarker": "(/\\*|\\b(do|select)\\b)",
-  "foldingStopMarker": "(\\*/|\\bend\\b)",
   "name": "REXX",
+  "scopeName": "source.rexx",
   "patterns": [
     {
+      "name": "comment.rexx",
       "begin": "/\\*",
-      "end": "\\*/",
-      "name": "comment.rexx"
+      "end": "\\*/"
     },
     {
-      "match": "(['\"])[01 ]+\\1(?i:b)",
-      "name": "constant.rexx"
+      "name": "constant.rexx",
+      "match": "(['\"])[01 ]+\\1(?i:b)"
     },
     {
-      "match": "(['\"])[0-9a-fA-F ]+\\1(?i:x)",
-      "name": "constant.rexx"
+      "name": "constant.rexx",
+      "match": "(['\"])[0-9a-fA-F ]+\\1(?i:x)"
     },
     {
+      "name": "string.rexx",
       "begin": "(['\"])",
-      "end": "\\1",
-      "name": "string.rexx"
+      "end": "\\1"
     },
     {
-      "match": "\\b[A-Za-z@#$!?_][A-Za-z@#$!?_0-9]*:",
-      "name": "entity.name.function.rexx"
+      "name": "entity.name.function.rexx",
+      "match": "\\b[A-Za-z@#$!?_][A-Za-z@#$!?_0-9]*:"
     },
     {
-      "match": "([0-9]+(\\.)?[0-9]*(?i:e[-+]?[0-9]+)?|[0-9]*(\\.)?[0-9]+)(?i:e[-+]?[0-9]+)?\\b",
-      "name": "constant.numeric.rexx"
+      "name": "constant.numeric.rexx",
+      "match": "([0-9]+(\\.)?[0-9]*(?i:e[-+]?[0-9]+)?|[0-9]*(\\.)?[0-9]+)(?i:e[-+]?[0-9]+)?\\b"
     },
     {
-      "match": "[0-9\\.][A-Za-z0-9@#$¢.!?_]*",
-      "name": "constant.other.rexx"
+      "name": "constant.other.rexx",
+      "match": "[0-9\\.][A-Za-z0-9@#$¢.!?_]*"
     },
     {
-      "match": "([\\+-/*%&|()¬\\\\=<>])",
-      "name": "keyword.operator.rexx"
+      "name": "keyword.operator.rexx",
+      "match": "([\\+-/*%\u0026|()¬\\\\=\u003c\u003e~])"
     },
     {
-      "match": "\\b(?i:do|forever|while|until|to|by|for|end|exit|if|then|else|iterate|leave|nop|return|select|when|otherwise|call(\\s+(off|on)\\s+(error|failure(\\s+name)?|halt))?|signal(\\s+(off|on)\\s+(error|failure(\\s+name)?|halt|novalue|syntax))|address\\s+\\w+|arg|drop|interpret|numeric\\s+(digits|form(\\s+(scientific|engineering|value))?|fuzz)|options|parse(\\s+upper)?\\s+(external|numeric|source|value|var|version)?|with|procedure(\\s+expose)?|pull|push|queue|say|trace\\s+\\w+|upper)\\b(?!\\.)",
-      "name": "keyword.rexx"
+      "name": "keyword.rexx",
+      "match": "\\b(?i:do|forever|while|until|to|by|for|end|exit|if|then|else|iterate|leave|nop|return|select|when|otherwise|call(\\s+(off|on)\\s+(error|failure(\\s+name)?|halt))?|signal(\\s+(off|on)\\s+(error|failure(\\s+name)?|halt|novalue|syntax))|address\\s+\\w+|arg|drop|interpret|numeric\\s+(digits|form(\\s+(scientific|engineering|value))?|fuzz)|options|parse(\\s+upper)?\\s+(external|numeric|source|value|var|version)?|with|procedure(\\s+expose)?|pull|push|queue|say|trace\\s+\\w+|upper)\\b(?!\\.)"
     },
     {
-      "match": "\\b[A-Za-z@#$!?_0-9]+(?=\\()",
-      "name": "support.function.rexx"
+      "name": "support.function.rexx",
+      "match": "\\b[A-Za-z@#$!?_0-9]+(?=\\()"
     },
     {
-      "match": "\\b[A-Za-z@#$¢!?_][A-Za-z0-9@#$¢.!?_]*",
-      "name": "variable.rexx"
+      "name": "variable.rexx",
+      "match": "\\b[A-Za-z@#$¢!?_][A-Za-z0-9@#$¢.!?_]*"
     }
-  ],
-  "scopeName": "source.rexx",
-  "uuid": "1ebe3dbc-ae7f-413a-990f-c37fc1b0d204"
-}
+  ]
+}

data/grammars/source.ring.json

@@ -1,80 +1,6 @@
 {
   "name": "ring",
   "scopeName": "source.ring",
-  "fileTypes": [
-    "ring",
-    "rh"
-  ],
-  "repository": {
-    "block_doc_comment": {
-      "comment": "Block documentation comment",
-      "name": "comment.block.documentation.ring",
-      "begin": "/\\*[!\\*][^\\*]",
-      "end": "\\*/",
-      "patterns": [
-        {
-          "include": "#block_doc_comment"
-        },
-        {
-          "include": "#block_comment"
-        }
-      ]
-    },
-    "block_comment": {
-      "comment": "Block comment",
-      "name": "comment.block.ring",
-      "begin": "/\\*",
-      "end": "\\*/",
-      "patterns": [
-        {
-          "include": "#block_doc_comment"
-        },
-        {
-          "include": "#block_comment"
-        }
-      ]
-    },
-    "line_doc_comment": {
-      "comment": "Single-line documentation comment",
-      "name": "comment.line.documentation.ring",
-      "match": "//[!/][^/].*$"
-    },
-    "line_comment": {
-      "comment": "Single-line comment",
-      "name": "comment.line.double-slash.ring",
-      "match": "//[#].*$"
-    },
-    "escaped_character": {
-      "name": "constant.character.escape.ring",
-      "match": "\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)"
-    },
-    "sigils": {
-      "comment": "Sigil",
-      "name": "keyword.operator.sigil.ring",
-      "match": "[@]|[:]{2}|[+]{2}(?=[a-zA-Z0-9_\\(\\[\\|\\\"]+)"
-    },
-    "string_literal": {
-      "comment": "Double-quote string",
-      "name": "string.quoted.double.ring",
-      "begin": "\"",
-      "end": "\"",
-      "patterns": [
-        {
-          "include": "#escaped_character"
-        }
-      ]
-    },
-    "self": {
-      "comment": "Self variable",
-      "name": "variable.self.language.ring",
-      "match": "\\b(Self|SELF|self)\\b"
-    },
-    "null": {
-      "comment": "null variable",
-      "name": "variable.null.language.ring",
-      "match": "\\b(NULL|null|Null)\\b"
-    }
-  },
   "patterns": [
     {
       "include": "#block_doc_comment"
@@ -92,7 +18,6 @@
       "include": "#sigils"
     },
     {
-      "comment": "Attribute",
       "name": "meta.attribute.ring",
       "begin": "#\\!?\\[",
       "end": "\\]",
@@ -103,7 +28,6 @@
       ]
     },
     {
-      "comment": "Single-quote string (character literal)",
       "name": "string.quoted.single.ring",
       "match": "'([^'\\\\]|\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.))'"
     },
@@ -111,37 +35,30 @@
       "include": "#string_literal"
     },
     {
-      "comment": "Floating point number (fraction)",
       "name": "constant.numeric.float.ring",
       "match": "\\b[0-9][0-9_]*\\.[0-9][0-9_]*([eE][+-][0-9_]+)?(f32|f64)?\\b"
     },
     {
-      "comment": "Integer number (decimal)",
       "name": "constant.numeric.integer.decimal.ring",
       "match": "\\b[0-9][0-9_]*([ui](8|16|32|64)?)?\\b"
     },
     {
-      "comment": "Static storage modifier",
       "name": "storage.modifier.static.ring",
       "match": "\\b(PRIVATE|private|Private)\\b"
     },
     {
-      "comment": "Boolean constant",
       "name": "constant.language.boolean.ring",
       "match": "(TRUE|true|True|FALSE|false|False)"
     },
     {
-      "comment": "variable name",
       "name": "variable.name.special.ring",
       "match": "\\b_[a-z][A-Za-z0-9_]*|\\s(i|j)\\s\\b"
     },
     {
-      "comment": "Control keyword",
       "name": "keyword.control.ring",
       "match": "\\b(EXIT|exit|Exit|LOOP|loop|Loop|BUT|but|But|ELSE|else|Else|IF|if|If|FOR|for|For|IN|in|In|TO|to|To|STEP|step|Step|NEXT|next|Next|SWITCH|switch|Switch|OFF|off|Off|ON|on|On|OTHER|other|Other|RETURN|return|Return|WHILE|while|While|DO|do|Do|END|end|End|AGAIN|again|Again|Try|try|Try|CATCH|catch|Catch|DONE|done|Done)\\b"
     },
     {
-      "comment": "ring keywords",
       "name": "keyword.command.ring",
       "match": "\\b(IF|if|If|TO|to|To|OR|or|Or|AND|and|And|NOT|not|Not|FOR|for|For|NEW|new|New|FUNC|func|Func|FROM|from|From|NEXT|next|Next|LOAD|load|Load|ELSE|else|Else|SEE|see|See|WHILE|while|While|OK|ok|Ok|CLASS|class|Class|BREAK|break|Break|RETURN|return|Return|BUT|but|But|END|end|End|GIVE|give|Give|BYE|bye|Bye|EXIT|exit|Exit|TRY|try|Try|CATCH|catch|Catch|DONE|done|Done|SWITCH|switch|Switch|ON|on|On|OTHER|other|Other|OFF|off|Off|IN|in|In|LOOP|loop|Loop|PACKAGE|package|Package|IMPORT|import|Import|PRIVATE|private|Private|STEP|step|Step|DO|do|Do|AGAIN|again|Again|CALL|call|Call)\\b"
     },
@@ -161,20 +78,18 @@
       "include": "#ref_lifetime"
     },
     {
-      "match": "(=|\\+=|-=)",
-      "name": "keyword.operator.assignment.ring"
+      "name": "keyword.operator.assignment.ring",
+      "match": "(=|\\+=|-=)"
     },
     {
-      "match": "(\\<=|>=|==|!=|NOT|not|Not|\\<>|\\<|>|\\$|\\sOR\\s|\\sAND\\s|\\sNOT\\s|\\sand\\s|\\sor\\s|\\snot\\s)",
-      "name": "keyword.operator.comparison.ring"
+      "name": "keyword.operator.comparison.ring",
+      "match": "(\\\u003c=|\u003e=|==|!=|NOT|not|Not|\\\u003c\u003e|\\\u003c|\u003e|\\$|\\sOR\\s|\\sAND\\s|\\sNOT\\s|\\sand\\s|\\sor\\s|\\snot\\s)"
     },
     {
-      "comment": "Standard library macro",
       "name": "support.function.std.ring",
       "match": "\\b(len|add|del|get|clock|lower|upper|input|ascii|char|date|time|filename|getchar|system|random|timelist|adddays|diffdays|isstring|isnumber|islist|type|isnull|isobject|hex|dec|number|string|str2hex|hex2str|str2list|list2str|left|right|trim|copy|substr|lines|strcmp|eval|raise|assert|isalnum|isalpha|iscntrl|isdigit|isgraph|islower|isprint|ispunct|isspace|isupper|isxdigit|locals|globals|functions|cfunctions|islocal|isglobal|isfunction|iscfunction|packages|ispackage|classes|isclass|packageclasses|ispackageclass|classname|objectid|attributes|methods|isattribute|ismethod|isprivateattribute|isprivatemethod|addattribute|addmethod|getattribute|setattribute|mergemethods|list|find|min|max|insert|sort|reverse|binarysearch|sin|cos|tan|asin|acos|atan|atan2|sinh|cosh|tanh|exp|log|log10|ceil|floor|fabs|pow|sqrt|unsigned|decimals|murmur3hash|fopen|fclose|fflush|freopen|tempfile|tempname|fseek|ftell|rewind|fgetpos|fsetpos|clearerr|feof|ferror|perror|rename|remove|fgetc|fgets|fputc|fputs|ungetc|fread|fwrite|dir|read|write|fexists|ismsdos|iswindows|iswindows64|isunix|ismacosx|islinux|isfreebsd|isandroid|windowsnl|mysql_info|mysql_init|mysql_error|mysql_connect|mysql_close|mysql_query|mysql_result|mysql_insert_id|mysql_columns|mysql_result2|mysql_next_result|mysql_escape_string|mysql_autocommit|mysql_commit|mysql_rollback|odbc_init|odbc_drivers|odbc_datasources|odbc_close|odbc_connect|odbc_disconnect|odbc_execute|odbc_colcount|odbc_fetch|odbc_getdata|odbc_tables|odbc_columns|odbc_autocommit|odbc_commit|odbc_rollback|md5|sha1|sha256|sha512|sha384|sha224|encrypt|decrypt|randbytes|download|sendemail|loadlib|closelib|callgc|varptr|intvalue)!"
     },
     {
-      "comment": "Function call",
       "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\s*\\(",
       "captures": {
         "1": {
@@ -183,7 +98,6 @@
       }
     },
     {
-      "comment": "Method call",
       "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*).([a-zA-Z_][a-zA-Z0-9_]*)\\s*\\(",
       "captures": {
         "1": {
@@ -192,7 +106,6 @@
       }
     },
     {
-      "comment": "Class variable usage",
       "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*).([a-zA-Z_][a-zA-Z0-9_]*)",
       "captures": {
         "1": {
@@ -204,9 +117,13 @@
       }
     },
     {
-      "comment": "Function definition",
       "begin": "\\b(FUNC|func|Func)\\s+([a-zA-Z_][a-zA-Z0-9_]*)",
       "end": "[\\n]",
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other.fn.ring"
@@ -214,17 +131,16 @@
         "2": {
           "name": "entity.name.function.ring"
         }
-      },
-      "patterns": [
-        {
-          "include": "$self"
-        }
-      ]
+      }
     },
     {
-      "comment": "CLASS definition",
       "begin": "\\b(CLASS|class|Class)\\s+([a-zA-Z_][a-zA-Z0-9_]*)(?:\\s+(FROM|from|From)\\s+([a-zA-Z_][a-zA-Z0-9_]*))?",
       "end": "[\\n]",
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.class.ring"
@@ -238,17 +154,16 @@
         "4": {
           "name": "entity.name.parent.class.ring"
         }
-      },
-      "patterns": [
-        {
-          "include": "$self"
-        }
-      ]
+      }
     },
     {
-      "comment": "Method definition",
       "begin": "\\b(FUNC|func|Func)\\s+((?:(?:[a-zA-Z_][a-zA-Z0-9_]*):)?(?:[a-zA-Z_][a-zA-Z0-9_]*))",
       "end": "[\\n]",
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.method.fn.ring"
@@ -256,22 +171,77 @@
         "2": {
           "name": "entity.name.method.ring"
         }
-      },
+      }
+    },
+    {
+      "begin": "=",
       "patterns": [
         {
           "include": "$self"
         }
       ]
+    }
+  ],
+  "repository": {
+    "block_comment": {
+      "name": "comment.block.ring",
+      "begin": "/\\*",
+      "end": "\\*/",
+      "patterns": [
+        {
+          "include": "#block_doc_comment"
+        },
+        {
+          "include": "#block_comment"
+        }
+      ]
     },
-    {
-      "comment": "Variable declaration",
-      "begin": "=",
-      "end": "",
+    "block_doc_comment": {
+      "name": "comment.block.documentation.ring",
+      "begin": "/\\*[!\\*][^\\*]",
+      "end": "\\*/",
       "patterns": [
         {
-          "include": "$self"
+          "include": "#block_doc_comment"
+        },
+        {
+          "include": "#block_comment"
+        }
+      ]
+    },
+    "escaped_character": {
+      "name": "constant.character.escape.ring",
+      "match": "\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)"
+    },
+    "line_comment": {
+      "name": "comment.line.double-slash.ring",
+      "match": "//[#].*$"
+    },
+    "line_doc_comment": {
+      "name": "comment.line.documentation.ring",
+      "match": "//[!/][^/].*$"
+    },
+    "null": {
+      "name": "variable.null.language.ring",
+      "match": "\\b(NULL|null|Null)\\b"
+    },
+    "self": {
+      "name": "variable.self.language.ring",
+      "match": "\\b(Self|SELF|self)\\b"
+    },
+    "sigils": {
+      "name": "keyword.operator.sigil.ring",
+      "match": "[@]|[:]{2}|[+]{2}(?=[a-zA-Z0-9_\\(\\[\\|\\\"]+)"
+    },
+    "string_literal": {
+      "name": "string.quoted.double.ring",
+      "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "include": "#escaped_character"
         }
       ]
     }
-  ]
-}
+  }
+}

data/grammars/source.rpm-spec.json

@@ -1,14 +1,10 @@
 {
-  "fileTypes": [
-    "spec"
-  ],
-  "foldingStartMarker": "(^%(build$|changelog|check$|clean$|description|files|install$|package|prep$|preun|pretrans|(pre($| .*))|posttrans|postun|post|trigger|triggerin|triggerpostun|triggerun|verifyscript)\\s*$)",
-  "foldingStopMarker": "(^%(build$|changelog|check$|clean$|description|files|install$|package|pre(p|un|trans)?|post(trans|un)?|trigger(in|postun|un)?|verifyscript)\\s*$)|Z",
   "name": "RPMSpec",
+  "scopeName": "source.rpm-spec",
   "patterns": [
     {
-      "match": "^# norootforbuild",
-      "name": "keyword.rpm-spec"
+      "name": "keyword.rpm-spec",
+      "match": "^# norootforbuild"
     },
     {
       "include": "#comments"
@@ -48,271 +44,321 @@
     }
   ],
   "repository": {
-    "licenses": {
+    "architectures": {
       "patterns": [
         {
-          "match": "(?:AFL-2.1|AGPL-3.0|AGPL-3.0\\+|Apache-1.1|Apache-2.0)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "\\b(?:noarch|i386|i586|x86_64|ia64|local)\\b"
         },
         {
-          "match": "(?:X11|xinetd|Zlib|ZPL-2.0|ZPL-2.1)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "\\b(?:s390x|s390|armv6l|armv7hl|armv7l)\\b"
         },
         {
-          "match": "(?:Apache-2.0+|APL-1.0|BSD-2-Clause|BSD-3-Clause|BSD-4-Clause)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "\\b(?:ppc64p7|ppc64le|ppc64|ppc|aarch64)\\b"
         },
         {
-          "match": "(?:Artistic-1.0|Artistic-1.0+|Artistic-2.0|Beerware)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "\\b(?:alpha|sparc64|sparcv9|sparc)\\b"
+        }
+      ]
+    },
+    "changelogs": {
+      "patterns": [
+        {
+          "include": "source.changelogs.rpm-spec"
+        }
+      ]
+    },
+    "commands": {
+      "patterns": [
+        {
+          "name": "support.constant.rpm-spec",
+          "match": "^%__(?:aclocal|ar|as|autoconf)"
         },
         {
-          "match": "(?:CC-BY-ND-4.0|CC-BY-SA-2.5|CC-BY-SA-3.0)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%__(?:autoheader|automake|awk)"
         },
         {
-          "match": "(?:CC-BY-SA-3.0|CC-BY-SA-4.0|CDDL-1.0|CPL-1.0|EPL-1.0)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%__(?:bzip2|bzip|cat|cc|chgrp_Rhf|chgrp)"
         },
         {
-          "match": "(?:ErlPL-1.1|GFDL-1.1|GFDL-1.1\\+|GFDL-1.2|GFDL-1.2\\+|GFDL-1.3)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%__(?:chmod|chown_Rhf|chown|cpio|cp)"
         },
         {
-          "match": "(?:GFDL-1.3\\+|GPL-1.0\\+|GPL-2.0|GPL-2.0\\+|GPL-3.0|GPL-3.0\\+|IJG)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%__(?:cpp|cxx|grep|gzip|patch)"
         },
         {
-          "match": "(?:LGPL-2.0\\+|LGPL-2.1|LGPL-2.1\\+|LGPL-3.0\\+|LPPL-1.3c)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%__(?:id_u|id|install|ld|libtoolize)"
         },
         {
-          "match": "(?:IPA|IPL-1.0|IPL-1.0|ISC|JSON|LGPL-2.0|MakeIndex|MIT)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%__(?:ln_s|make|mkdir_p|mkdir|mv)"
         },
         {
-          "match": "(?:MPL-1.0|MPL-1.1|MPL-1.1\\+|MS-PL|NetCDF|OFL-1.1|OLDAP-2.8)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%__(?:nm|objcopy|objdump|perl)"
         },
         {
-          "match": "(?:OSL-1.1|PHP-3.01|Python-2.0|Qhull|QPL-1.0|QPL-1.0|Ruby)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%__(?:pgp|prelink_undo_cmd|python)"
         },
         {
-          "match": "(?:SUSE-BSD-3-Clause-with-non-nuclear-addition)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%__(?:ranlib|rm|sed|strip|tar|unzip)"
         },
         {
-          "match": "(?:SUSE-GPL-2.0\\+-with-sane-exception|SUSE-GPL-3.0-with-FLOSS-exception)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%\\{__(?:aclocal|ar|as|autoconf)\\}"
         },
         {
-          "match": "(?:SUSE-GPL-3.0-with-font-exception|SUSE-GPL-3.0-with-openssl-exception)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%\\{__(?:autoheader|automake|awk)\\}"
         },
         {
-          "match": "(?:SUSE-GPL-3.0-with-template-exception|SUSE-GPL-3.0+-with-autoconf-exception)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%\\{__(?:bzip2|bzip|cat|cc|chgrp_Rhf|chgrp)\\}"
         },
         {
-          "match": "(?:SUSE-GPL-3.0\\+-with-font-exception|SUSE-GPL-3.0\\+-with-openssl-exception)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%\\{__(?:chmod|chown_Rhf|chown|cpio|cp)\\}"
         },
         {
-          "match": "(?:SUSE-IBPL-1.0|SUSE-IDPL-1.0|SUSE-IEEE|SUSE-Innernet-2.0|SUSE-Innernet-2.00)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%\\{__(?:cpp|cxx|grep|gzip|patch)\\}"
         },
         {
-          "match": "(?:SUSE-LDPL-2.0|SUSE-LGPL-2.0-with-linking-exception)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%\\{__(?:id_u|id|install|ld|libtoolize)\\}"
         },
         {
-          "match": "(?:SUSE-LGPL-2.1-with-digia-exception-1.1)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%\\{__(?:ln_s|make|mkdir_p|mkdir|mv)\\}"
         },
         {
-          "match": "(?:SUSE-LGPL-2.1-with-nokia-exception-1.1)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%\\{__(?:nm|objcopy|objdump|perl)\\}"
         },
         {
-          "match": "(?:SUSE-LGPL-2.1\\+-with-GCC-exception|SUSE-LGPL-3.0-with-openssl-exception)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%\\{__(?:pgp|prelink_undo_cmd|python)\\}"
         },
         {
-          "match": "(?:SUSE-Liberation|SUSE-Manpages|SUSE-Matplotlib|SUSE-MgOpen|SUSE-mirror)",
-          "name": "constant.language.rpm-spec"
+          "name": "support.constant.rpm-spec",
+          "match": "^%\\{__(?:ranlib|rm|sed|strip|tar|unzip)\\}"
+        }
+      ]
+    },
+    "comments": {
+      "patterns": [
+        {
+          "match": "(#)(?\u003c!C#|F#|M#)(.*)$",
+          "captures": {
+            "1": {
+              "name": "punctuation.comment.rpm-spec"
+            },
+            "2": {
+              "name": "comment.line.rpm-spec"
+            }
+          }
+        }
+      ]
+    },
+    "conditionals": {
+      "patterns": [
+        {
+          "name": "keyword.control.rpm-spec",
+          "match": "%(?:ifarch|ifnarch|ifnos|ifos|if|else|endif)"
+        }
+      ]
+    },
+    "constants": {
+      "patterns": [
+        {
+          "name": "contstant.numeric.rpm-spec",
+          "match": "[0-9]+"
+        }
+      ]
+    },
+    "licenses": {
+      "patterns": [
+        {
+          "name": "constant.language.rpm-spec",
+          "match": "(?:AFL-2.1|AGPL-3.0|AGPL-3.0\\+|Apache-1.1|Apache-2.0)"
         },
         {
-          "match": "(?:SUSE-mplus|SUSE-NonFree|SUSE-Oasis-Specification-Notice)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:X11|xinetd|Zlib|ZPL-2.0|ZPL-2.1)"
         },
         {
-          "match": "(?:SUSE-OpenPublication-1.0|SUSE-OldFSFDocLicense|SUSE-Permissive)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:Apache-2.0+|APL-1.0|BSD-2-Clause|BSD-3-Clause|BSD-4-Clause)"
         },
         {
-          "match": "(?:SUSE-Permissive-Modify-By-Patch|SUSE-PHP-2.02|SUSE-Public-Domain)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:Artistic-1.0|Artistic-1.0+|Artistic-2.0|Beerware)"
         },
         {
-          "match": "(?:SUSE-Python-1.6|SUSE-QWT-1.0|SUSE-Redistributable-Content|SUSE-Repoze)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:CC-BY-ND-4.0|CC-BY-SA-2.5|CC-BY-SA-3.0)"
         },
         {
-          "match": "(?:SUSE-Scrot|SUSE-Sendmail|SUSE-SGI-FreeB-2.0|SUSE-SIP|SUSE-SLIB)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:CC-BY-SA-3.0|CC-BY-SA-4.0|CDDL-1.0|CPL-1.0|EPL-1.0)"
         },
         {
-          "match": "(?:SUSE-SNIA-1.0|SUSE-SNIA-1.1|SUSE-Sun-Laboratories|SUSE-TeX|SUSE-TGPPL-1.0)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:ErlPL-1.1|GFDL-1.1|GFDL-1.1\\+|GFDL-1.2|GFDL-1.2\\+|GFDL-1.3)"
         },
         {
-          "match": "(?:SUSE-Ubuntu-Font-License-1.0|SUSE-Xano|SUSE-Xenonsoft-1.00)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:GFDL-1.3\\+|GPL-1.0\\+|GPL-2.0|GPL-2.0\\+|GPL-3.0|GPL-3.0\\+|IJG)"
         },
         {
-          "match": "(?:SUSE-XFree86-with-font-exception|SUSE-XSL-Lint|TCL|Unicode|Vim|W3C|WTFPL)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:LGPL-2.0\\+|LGPL-2.1|LGPL-2.1\\+|LGPL-3.0\\+|LPPL-1.3c)"
         },
         {
-          "match": "(?:SUSE-Bitstream-Vera|OML|OPL-1.0|SUSE-Arphic)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:IPA|IPL-1.0|IPL-1.0|ISC|JSON|LGPL-2.0|MakeIndex|MIT)"
         },
         {
-          "match": "(?:SUSE-BSD-Mark-Modifications|SUSE-CacertRoot)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:MPL-1.0|MPL-1.1|MPL-1.1\\+|MS-PL|NetCDF|OFL-1.1|OLDAP-2.8)"
         },
         {
-          "match": "(?:SUSE-Copyleft-Next-0.3.0|SUSE-CPL-0.5|SUSE-Curb|SUSE-DMTF)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:OSL-1.1|PHP-3.01|Python-2.0|Qhull|QPL-1.0|QPL-1.0|Ruby)"
         },
         {
-          "match": "(?:SUSE-Docbook-XSL|SUSE-Egenix-1.1.0|SUSE-EULA|SUSE-FHS)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-BSD-3-Clause-with-non-nuclear-addition)"
         },
         {
-          "match": "(?:SUSE-Firmware|SUSE-FLTK|SUSE-Free-Art-1.3|SUSE-Freetype)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-GPL-2.0\\+-with-sane-exception|SUSE-GPL-3.0-with-FLOSS-exception)"
         },
         {
-          "match": "(?:SUSE-Gitslave|SUSE-GL2PS-2.0|SUSE-Gnuplot)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-GPL-3.0-with-font-exception|SUSE-GPL-3.0-with-openssl-exception)"
         },
         {
-          "match": "(?:SUSE-GPL-2.0-with-FLOSS-exception)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-GPL-3.0-with-template-exception|SUSE-GPL-3.0+-with-autoconf-exception)"
         },
         {
-          "match": "(?:SUSE-CC-Sampling-Plus-1.0|SUSE-GPL-2.0-with-linking-exception)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-GPL-3.0\\+-with-font-exception|SUSE-GPL-3.0\\+-with-openssl-exception)"
         },
         {
-          "match": "(?:SUSE-GPL-2.0-with-openssl-exception)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-IBPL-1.0|SUSE-IDPL-1.0|SUSE-IEEE|SUSE-Innernet-2.0|SUSE-Innernet-2.00)"
         },
         {
-          "match": "(?:SUSE-GPL-2.0-with-OSI-exception)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-LDPL-2.0|SUSE-LGPL-2.0-with-linking-exception)"
         },
         {
-          "match": "(?:SUSE-GPL-2.0-with-plugin-exception)",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-LGPL-2.1-with-digia-exception-1.1)"
         },
         {
-          "match": "(?:SUSE-GPL-2.0\\+-with-openssl-exception)",
-          "name": "constant.language.rpm-spec"
-        }
-      ]
-    },
-    "architectures": {
-      "patterns": [
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-LGPL-2.1-with-nokia-exception-1.1)"
+        },
         {
-          "match": "\\b(?:noarch|i386|i586|x86_64|ia64|local)\\b",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-LGPL-2.1\\+-with-GCC-exception|SUSE-LGPL-3.0-with-openssl-exception)"
         },
         {
-          "match": "\\b(?:s390x|s390|armv6l|armv7hl|armv7l)\\b",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-Liberation|SUSE-Manpages|SUSE-Matplotlib|SUSE-MgOpen|SUSE-mirror)"
         },
         {
-          "match": "\\b(?:ppc64p7|ppc64le|ppc64|ppc|aarch64)\\b",
-          "name": "constant.language.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-mplus|SUSE-NonFree|SUSE-Oasis-Specification-Notice)"
         },
         {
-          "match": "\\b(?:alpha|sparc64|sparcv9|sparc)\\b",
-          "name": "constant.language.rpm-spec"
-        }
-      ]
-    },
-    "metadata": {
-      "patterns": [
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-OpenPublication-1.0|SUSE-OldFSFDocLicense|SUSE-Permissive)"
+        },
         {
-          "match": "^(?:Icon|ExclusiveOs|ExcludeOs|NoSource|NoPatch):",
-          "name": "keyword.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-Permissive-Modify-By-Patch|SUSE-PHP-2.02|SUSE-Public-Domain)"
         },
         {
-          "match": "^(?:Conflicts|Obsoletes|Provides):",
-          "name": "keyword.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-Python-1.6|SUSE-QWT-1.0|SUSE-Redistributable-Content|SUSE-Repoze)"
         },
         {
-          "match": "^(?:Requires\\((?:preun|postun|pre|post)\\)|Requires):",
-          "name": "keyword.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-Scrot|SUSE-Sendmail|SUSE-SGI-FreeB-2.0|SUSE-SIP|SUSE-SLIB)"
         },
         {
-          "match": "^(Enhances|Suggests|BuildConflicts|BuildRequires|Recommends):",
-          "name": "keyword.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-SNIA-1.0|SUSE-SNIA-1.1|SUSE-Sun-Laboratories|SUSE-TeX|SUSE-TGPPL-1.0)"
         },
         {
-          "match": "^(PreReq|Supplements|Epoch|Serial|Nosource|Nopatch):",
-          "name": "keyword.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-Ubuntu-Font-License-1.0|SUSE-Xano|SUSE-Xenonsoft-1.00)"
         },
         {
-          "match": "^(AutoReq|AutoProv|AutoReqProv):",
-          "name": "keyword.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-XFree86-with-font-exception|SUSE-XSL-Lint|TCL|Unicode|Vim|W3C|WTFPL)"
         },
         {
-          "match": "^(Copyright|Summary|Summary\\(.*\\)|Distribution):",
-          "name": "keyword.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-Bitstream-Vera|OML|OPL-1.0|SUSE-Arphic)"
         },
         {
-          "match": "^(Vendor|Packager|Group|Source\\d*|Patch\\d*|BuildRoot|Prefix):",
-          "name": "keyword.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-BSD-Mark-Modifications|SUSE-CacertRoot)"
         },
         {
-          "match": "^(Name|Version|Release|Url|URL):",
-          "name": "keyword.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-Copyleft-Next-0.3.0|SUSE-CPL-0.5|SUSE-Curb|SUSE-DMTF)"
         },
         {
-          "match": "^(Source|Patch)[0-9]*:",
-          "name": "keyword.rpm-spec"
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-Docbook-XSL|SUSE-Egenix-1.1.0|SUSE-EULA|SUSE-FHS)"
         },
         {
-          "begin": "^((?:BuildArch|BuildArchitectures|ExclusiveArch|ExcludeArch):)",
-          "end": "$",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.rpm-spec"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#architectures"
-            }
-          ]
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-Firmware|SUSE-FLTK|SUSE-Free-Art-1.3|SUSE-Freetype)"
         },
         {
-          "begin": "^(License:)[ \\t]*",
-          "end": "$",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.rpm-spec"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#licenses"
-            }
-          ]
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-Gitslave|SUSE-GL2PS-2.0|SUSE-Gnuplot)"
+        },
+        {
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-GPL-2.0-with-FLOSS-exception)"
+        },
+        {
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-CC-Sampling-Plus-1.0|SUSE-GPL-2.0-with-linking-exception)"
+        },
+        {
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-GPL-2.0-with-openssl-exception)"
+        },
+        {
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-GPL-2.0-with-OSI-exception)"
+        },
+        {
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-GPL-2.0-with-plugin-exception)"
+        },
+        {
+          "name": "constant.language.rpm-spec",
+          "match": "(?:SUSE-GPL-2.0\\+-with-openssl-exception)"
         }
       ]
     },
@@ -327,195 +373,190 @@
           }
         },
         {
-          "match": "^%\\{?(?:desktop_database_postun|desktop_database_post)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:desktop_database_postun|desktop_database_post)\\}?"
         },
         {
-          "match": "^%\\{?(?:fillup_and_insserv|fillup_only|find_lang)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:fillup_and_insserv|fillup_only|find_lang)\\}?"
         },
         {
-          "match": "^%\\{?(?:icon_theme_cache_postun|icon_theme_cache_post)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:icon_theme_cache_postun|icon_theme_cache_post)\\}?"
         },
         {
-          "match": "^%\\{?(?:insserv_cleanup|insserv_force_if_yast)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:insserv_cleanup|insserv_force_if_yast)\\}?"
         },
         {
-          "match": "^%\\{?(?:install_info_delete|install_info|gpg_verify)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:install_info_delete|install_info|gpg_verify)\\}?"
         },
         {
-          "match": "^%\\{?(?:perl_archlib|perl_gen_filelist)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:perl_archlib|perl_gen_filelist)\\}?"
         },
         {
-          "match": "^%\\{?(?:perl_make_install|perl_process_packlist)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:perl_make_install|perl_process_packlist)\\}?"
         },
         {
-          "match": "^%\\{?(?:perl_sitearch|perl_sitelib)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:perl_sitearch|perl_sitelib)\\}?"
         },
         {
-          "match": "^%\\{?(?:perl_vendorarch|perl_vendorlib|perl_version)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:perl_vendorarch|perl_vendorlib|perl_version)\\}?"
         },
         {
-          "match": "^%\\{?(?:py_incdir|py_libdir|py_requires|py_sitedir|py_ver)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:py_incdir|py_libdir|py_requires|py_sitedir|py_ver)\\}?"
         },
         {
-          "match": "^%\\{?(?:remove_and_set|restart_on_update)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:remove_and_set|restart_on_update)\\}?"
         },
         {
-          "match": "^%\\{?(?:run_ldconfig|run_permissions)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:run_ldconfig|run_permissions)\\}?"
         },
         {
-          "match": "^%\\{?(?:service_add_pre|service_add_post)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:service_add_pre|service_add_post)\\}?"
         },
         {
-          "match": "^%\\{?(?:service_del_preun|service_del_postun)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:service_del_preun|service_del_postun)\\}?"
         },
         {
-          "match": "^%\\{?(?:set_permissions|stop_on_removal)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:set_permissions|stop_on_removal)\\}?"
         },
         {
-          "match": "^%\\{?(?:suse_update_config|suse_update_desktop_file)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:suse_update_config|suse_update_desktop_file)\\}?"
         },
         {
-          "match": "^%\\{?(?:tcl_version|ul_version|verify_permissions)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:tcl_version|ul_version|verify_permissions)\\}?"
         },
         {
-          "match": "^%\\{?(?:create_subdir_filelist|create_exclude_filelist)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:create_subdir_filelist|create_exclude_filelist)\\}?"
         },
         {
-          "match": "^%\\{?(?:makeinstall|make_jobs|update_menus|clean_menus)\\}?",
-          "name": "support.function.rpm-spec"
+          "name": "support.function.rpm-spec",
+          "match": "^%\\{?(?:makeinstall|make_jobs|update_menus|clean_menus)\\}?"
         }
       ]
     },
-    "sections": {
+    "metadata": {
       "patterns": [
         {
-          "match": "^%(?:description|package)",
-          "name": "entity.name.section.rpm-spec"
+          "name": "keyword.rpm-spec",
+          "match": "^(?:Icon|ExclusiveOs|ExcludeOs|NoSource|NoPatch):"
         },
         {
-          "begin": "^(%changelog)",
-          "beginCaptures": {
-            "1": {
-              "name": "entity.name.section.rpm-spec"
-            }
-          },
-          "end": "Z",
-          "patterns": [
-            {
-              "include": "#changelogs"
-            }
-          ]
+          "name": "keyword.rpm-spec",
+          "match": "^(?:Conflicts|Obsoletes|Provides):"
         },
         {
-          "begin": "^(%files)",
-          "beginCaptures": {
-            "1": {
-              "name": "entity.name.section.rpm-spec"
-            }
-          },
-          "end": "^$|Z",
-          "patterns": [
-            {
-              "include": "#std_section"
-            }
-          ]
+          "name": "keyword.rpm-spec",
+          "match": "^(?:Requires\\((?:preun|postun|pre|post)\\)|Requires):"
         },
         {
-          "begin": "^(%(?:build|check|clean|install|verifyscript))$",
-          "beginCaptures": {
-            "1": {
-              "name": "entity.name.section.rpm-spec"
-            }
-          },
-          "end": "^$|Z",
-          "patterns": [
-            {
-              "include": "#std_section"
-            }
-          ]
+          "name": "keyword.rpm-spec",
+          "match": "^(Enhances|Suggests|BuildConflicts|BuildRequires|Recommends):"
         },
         {
-          "match": "^%(?:triggerin|triggerpostun|triggerun|trigger) --",
-          "name": "entity.name.section.rpm-spec"
+          "name": "keyword.rpm-spec",
+          "match": "^(PreReq|Supplements|Epoch|Serial|Nosource|Nopatch):"
         },
         {
-          "begin": "^(%(?:preun|prep|pretrans|pre|posttrans|postun|post|packagepreun))",
-          "beginCaptures": {
-            "1": {
-              "name": "entity.name.section.rpm-spec"
-            }
-          },
-          "end": "^$|Z",
-          "patterns": [
-            {
-              "include": "#std_section"
-            }
-          ]
-        }
-      ]
-    },
-    "std_section": {
-      "patterns": [
-        {
-          "include": "#comments"
+          "name": "keyword.rpm-spec",
+          "match": "^(AutoReq|AutoProv|AutoReqProv):"
         },
         {
-          "include": "#metadata"
+          "name": "keyword.rpm-spec",
+          "match": "^(Copyright|Summary|Summary\\(.*\\)|Distribution):"
         },
         {
-          "include": "#conditionals"
+          "name": "keyword.rpm-spec",
+          "match": "^(Vendor|Packager|Group|Source\\d*|Patch\\d*|BuildRoot|Prefix):"
         },
         {
-          "include": "#commands"
+          "name": "keyword.rpm-spec",
+          "match": "^(Name|Version|Release|Url|URL):"
         },
         {
-          "include": "#macros"
+          "name": "keyword.rpm-spec",
+          "match": "^(Source|Patch)[0-9]*:"
         },
         {
-          "include": "#modifiers"
+          "begin": "^((?:BuildArch|BuildArchitectures|ExclusiveArch|ExcludeArch):)",
+          "end": "$",
+          "patterns": [
+            {
+              "include": "#architectures"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.rpm-spec"
+            }
+          }
         },
         {
-          "include": "#variables"
+          "begin": "^(License:)[ \\t]*",
+          "end": "$",
+          "patterns": [
+            {
+              "include": "#licenses"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.rpm-spec"
+            }
+          }
+        }
+      ]
+    },
+    "modifiers": {
+      "patterns": [
+        {
+          "name": "storage.modifier.rpm-spec",
+          "match": "^%(?:define|global|undefine|docdir|doc)"
         },
         {
-          "include": "#licenses"
+          "match": "^(%config(?:\\(noreplace\\))?)[ \\t]+",
+          "captures": {
+            "1": {
+              "name": "storage.modifier.rpm-spec"
+            }
+          }
         },
         {
-          "include": "#constants"
+          "match": "^(%defattr\\(.*\\))",
+          "captures": {
+            "1": {
+              "name": "storage.modifier.rpm-spec"
+            }
+          }
         },
         {
-          "include": "#shell_syntax"
-        }
-      ]
-    },
-    "comments": {
-      "patterns": [
+          "match": "(%(?:attrib|attr|verify|noverify)\\(.*\\)) ",
+          "captures": {
+            "1": {
+              "name": "storage.modifier.rpm-spec"
+            }
+          }
+        },
         {
-          "match": "(#)(?<!C#|F#|M#)(.*)$",
+          "match": "(%(?:lang|caps)\\(.*\\)) ",
           "captures": {
             "1": {
-              "name": "punctuation.comment.rpm-spec"
-            },
-            "2": {
-              "name": "comment.line.rpm-spec"
+              "name": "storage.modifier.rpm-spec"
             }
           }
         }
@@ -524,100 +565,117 @@
     "operators": {
       "patterns": [
         {
-          "match": "(?:[>=]?=|!=?|<|>|&&|\\|\\|)",
-          "name": "keyword.operator.logical.rpm-spec"
+          "name": "keyword.operator.logical.rpm-spec",
+          "match": "(?:[\u003e=]?=|!=?|\u003c|\u003e|\u0026\u0026|\\|\\|)"
         }
       ]
     },
-    "constants": {
-      "patterns": [
-        {
-          "match": "[0-9]+",
-          "name": "contstant.numeric.rpm-spec"
-        }
-      ]
-    },
-    "commands": {
+    "sections": {
       "patterns": [
         {
-          "match": "^%__(?:aclocal|ar|as|autoconf)",
-          "name": "support.constant.rpm-spec"
-        },
-        {
-          "match": "^%__(?:autoheader|automake|awk)",
-          "name": "support.constant.rpm-spec"
+          "name": "entity.name.section.rpm-spec",
+          "match": "^%(?:description|package)"
         },
         {
-          "match": "^%__(?:bzip2|bzip|cat|cc|chgrp_Rhf|chgrp)",
-          "name": "support.constant.rpm-spec"
-        },
-        {
-          "match": "^%__(?:chmod|chown_Rhf|chown|cpio|cp)",
-          "name": "support.constant.rpm-spec"
-        },
-        {
-          "match": "^%__(?:cpp|cxx|grep|gzip|patch)",
-          "name": "support.constant.rpm-spec"
+          "begin": "^(%changelog)",
+          "end": "Z",
+          "patterns": [
+            {
+              "include": "#changelogs"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.section.rpm-spec"
+            }
+          }
         },
         {
-          "match": "^%__(?:id_u|id|install|ld|libtoolize)",
-          "name": "support.constant.rpm-spec"
+          "begin": "^(%files)",
+          "end": "^$|Z",
+          "patterns": [
+            {
+              "include": "#std_section"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.section.rpm-spec"
+            }
+          }
         },
         {
-          "match": "^%__(?:ln_s|make|mkdir_p|mkdir|mv)",
-          "name": "support.constant.rpm-spec"
+          "begin": "^(%(?:build|check|clean|install|verifyscript))$",
+          "end": "^$|Z",
+          "patterns": [
+            {
+              "include": "#std_section"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.section.rpm-spec"
+            }
+          }
         },
         {
-          "match": "^%__(?:nm|objcopy|objdump|perl)",
-          "name": "support.constant.rpm-spec"
+          "name": "entity.name.section.rpm-spec",
+          "match": "^%(?:triggerin|triggerpostun|triggerun|trigger) --"
         },
         {
-          "match": "^%__(?:pgp|prelink_undo_cmd|python)",
-          "name": "support.constant.rpm-spec"
-        },
+          "begin": "^(%(?:preun|prep|pretrans|pre|posttrans|postun|post|packagepreun))",
+          "end": "^$|Z",
+          "patterns": [
+            {
+              "include": "#std_section"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.section.rpm-spec"
+            }
+          }
+        }
+      ]
+    },
+    "shell_syntax": {
+      "patterns": [
         {
-          "match": "^%__(?:ranlib|rm|sed|strip|tar|unzip)",
-          "name": "support.constant.rpm-spec"
-        },
+          "include": "source.shell"
+        }
+      ]
+    },
+    "std_section": {
+      "patterns": [
         {
-          "match": "^%\\{__(?:aclocal|ar|as|autoconf)\\}",
-          "name": "support.constant.rpm-spec"
+          "include": "#comments"
         },
         {
-          "match": "^%\\{__(?:autoheader|automake|awk)\\}",
-          "name": "support.constant.rpm-spec"
+          "include": "#metadata"
         },
         {
-          "match": "^%\\{__(?:bzip2|bzip|cat|cc|chgrp_Rhf|chgrp)\\}",
-          "name": "support.constant.rpm-spec"
+          "include": "#conditionals"
         },
         {
-          "match": "^%\\{__(?:chmod|chown_Rhf|chown|cpio|cp)\\}",
-          "name": "support.constant.rpm-spec"
+          "include": "#commands"
         },
         {
-          "match": "^%\\{__(?:cpp|cxx|grep|gzip|patch)\\}",
-          "name": "support.constant.rpm-spec"
+          "include": "#macros"
         },
         {
-          "match": "^%\\{__(?:id_u|id|install|ld|libtoolize)\\}",
-          "name": "support.constant.rpm-spec"
+          "include": "#modifiers"
         },
         {
-          "match": "^%\\{__(?:ln_s|make|mkdir_p|mkdir|mv)\\}",
-          "name": "support.constant.rpm-spec"
+          "include": "#variables"
         },
         {
-          "match": "^%\\{__(?:nm|objcopy|objdump|perl)\\}",
-          "name": "support.constant.rpm-spec"
+          "include": "#licenses"
         },
         {
-          "match": "^%\\{__(?:pgp|prelink_undo_cmd|python)\\}",
-          "name": "support.constant.rpm-spec"
+          "include": "#constants"
         },
         {
-          "match": "^%\\{__(?:ranlib|rm|sed|strip|tar|unzip)\\}",
-          "name": "support.constant.rpm-spec"
+          "include": "#shell_syntax"
         }
       ]
     },
@@ -702,73 +760,6 @@
           }
         }
       ]
-    },
-    "modifiers": {
-      "patterns": [
-        {
-          "match": "^%(?:define|global|undefine|docdir|doc)",
-          "name": "storage.modifier.rpm-spec"
-        },
-        {
-          "match": "^(%config(?:\\(noreplace\\))?)[ \\t]+",
-          "captures": {
-            "1": {
-              "name": "storage.modifier.rpm-spec"
-            }
-          }
-        },
-        {
-          "match": "^(%defattr\\(.*\\))",
-          "captures": {
-            "1": {
-              "name": "storage.modifier.rpm-spec"
-            }
-          }
-        },
-        {
-          "match": "(%(?:attrib|attr|verify|noverify)\\(.*\\)) ",
-          "captures": {
-            "1": {
-              "name": "storage.modifier.rpm-spec"
-            }
-          }
-        },
-        {
-          "match": "(%(?:lang|caps)\\(.*\\)) ",
-          "captures": {
-            "1": {
-              "name": "storage.modifier.rpm-spec"
-            }
-          }
-        }
-      ]
-    },
-    "conditionals": {
-      "patterns": [
-        {
-          "match": "%(?:ifarch|ifnarch|ifnos|ifos|if|else|endif)",
-          "name": "keyword.control.rpm-spec"
-        }
-      ]
-    },
-    "shell_syntax": {
-      "comment": "Set disabled to 1 to turn off syntax highlight of shellcode",
-      "disabled": 0,
-      "patterns": [
-        {
-          "include": "source.shell"
-        }
-      ]
-    },
-    "changelogs": {
-      "comment": "Set disabled to 1 to turn off syntax highlight of logs",
-      "disabled": 0,
-      "patterns": [
-        {
-          "include": "source.changelogs.rpm-spec"
-        }
-      ]
     }
-  },
-  "scopeName": "source.rpm-spec"
-}
+  }
+}