github-linguist 5.3.3 → 6.0.0

data/grammars/source.papyrus.skyrim.json

@@ -1,13 +1,8 @@
 {
   "name": "Papyrus - Skyrim",
   "scopeName": "source.papyrus.skyrim",
-  "fileTypes": [
-    "psc"
-  ],
-  "uuid": "01a6e257-d5f5-46f0-8795-b04ebd6eeaa7",
   "patterns": [
     {
-      "comment": "Empty line",
       "name": "meta.emptyline.papyrus",
       "match": "^\\s*$"
     },
@@ -88,133 +83,74 @@
     }
   ],
   "repository": {
-    "endOfLine": {
+    "addExpression": {
       "patterns": [
         {
-          "include": "#commentBlock"
-        },
-        {
-          "include": "#commentLine"
-        },
-        {
-          "include": "#whitespace"
-        },
-        {
-          "include": "#multiline"
+          "name": "keyword.operator.papyrus",
+          "match": "(\\+|\\-)"
         },
         {
-          "include": "#unmatched"
+          "include": "#multExpression"
         }
       ]
     },
-    "comments": {
+    "andExpression": {
       "patterns": [
         {
-          "include": "#commentBlock"
-        },
-        {
-          "include": "#commentLine"
+          "name": "keyword.operator.papyrus",
+          "match": "\\\u0026\\\u0026"
         },
         {
-          "include": "#commentDocumentation"
+          "include": "#boolExpression"
         }
       ]
     },
-    "commentBlock": {
+    "arrayAtom": {
       "patterns": [
         {
-          "comment": "Comment block",
-          "name": "comment.block.papyrus",
-          "begin": ";/",
-          "end": "/;"
-        }
-      ]
-    },
-    "commentLine": {
-      "patterns": [
+          "name": "meta.array.papyrus",
+          "begin": "\\[",
+          "end": "\\]",
+          "patterns": [
+            {
+              "include": "#expression"
+            }
+          ]
+        },
         {
-          "comment": "Single line comment",
-          "name": "comment.line.papyrus",
-          "match": ";.*$"
+          "include": "#atom"
         }
       ]
     },
-    "commentDocumentation": {
+    "arrayFuncOrId": {
       "patterns": [
         {
-          "comment": "Documentation comment",
-          "name": "comment.documentation.papyrus",
-          "begin": "^\\s*\\{",
-          "end": "\\}"
-        }
-      ]
-    },
-    "scriptHeader": {
-      "patterns": [
+          "include": "#funcOrId"
+        },
         {
-          "comment": "Scriptheader",
-          "name": "meta.scriptheader.papyrus",
-          "begin": "(?i)^\\s*(scriptname)\\s+",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.papyrus"
-            }
-          },
-          "end": "([\\n\\r])",
+          "name": "meta.arrayelement.papyrus",
+          "begin": "\\[",
+          "end": "\\]",
           "patterns": [
             {
-              "comment": "Script parent declaration",
-              "name": "keyword.other.papyrus",
-              "match": "(?i)\\b(extends)\\b"
-            },
-            {
-              "comment": "Script flags",
-              "name": "keyword.other.papyrus",
-              "match": "(?i)\\b(hidden|conditional)\\b"
-            },
-            {
-              "include": "#illegalKeywords"
-            },
-            {
-              "include": "#illegalSpecialVariables"
-            },
-            {
-              "include": "#illegalBaseTypes"
-            },
-            {
-              "include": "#typeIdentifier"
-            },
-            {
-              "include": "#endOfLine"
+              "include": "#expression"
             }
           ]
         }
       ]
     },
-    "import": {
+    "assign": {
       "patterns": [
         {
-          "comment": "Import statement",
-          "name": "meta.import.papyrus",
-          "begin": "(?i)^\\s*(import)\\s+",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.papyrus"
-            }
-          },
+          "name": "meta.assign.papyrus",
+          "begin": "^\\s*",
           "end": "([\\n\\r])",
           "patterns": [
             {
-              "include": "#illegalKeywords"
-            },
-            {
-              "include": "#illegalSpecialVariables"
-            },
-            {
-              "include": "#illegalBaseTypes"
+              "include": "#assignmentOperators"
             },
             {
-              "include": "#typeIdentifier"
+              "include": "#expression"
             },
             {
               "include": "#endOfLine"
@@ -223,431 +159,207 @@
         }
       ]
     },
-    "state": {
+    "assignmentOperators": {
       "patterns": [
         {
-          "comment": "State declaration",
-          "name": "meta.state.papyrus",
-          "begin": "(?i)^\\s*(?:(auto)\\s+)?(state)\\s+",
+          "name": "keyword.operator.papyrus",
+          "match": "(\\=|\\+\\=|\\-\\=|\\*\\=|\\/\\=|\\%\\=)"
+        }
+      ]
+    },
+    "atom": {
+      "patterns": [
+        {
+          "name": "meta.newarray.papyrus",
+          "begin": "(?i)\\b(new)\\s+([_a-z][0-9_a-z]*)\\[",
+          "end": "\\]",
+          "patterns": [
+            {
+              "include": "#integer"
+            }
+          ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.other.papyrus"
+              "name": "keyword.operator.papyrus"
             },
             "2": {
-              "name": "keyword.other.papyrus"
+              "name": "storage.type.papyrus"
             }
-          },
-          "end": "([\\n\\r])",
+          }
+        },
+        {
+          "name": "meta.parenthesis.papyrus",
+          "begin": "\\(",
+          "end": "(\\)|[\\n\\r])",
           "patterns": [
             {
-              "include": "#illegalKeywords"
-            },
-            {
-              "include": "#illegalSpecialVariables"
-            },
-            {
-              "include": "#illegalBaseTypes"
-            },
-            {
-              "include": "#identifier"
-            },
-            {
-              "include": "#endOfLine"
+              "include": "#expression"
             }
           ]
+        },
+        {
+          "include": "#funcOrId"
         }
       ]
     },
-    "endState": {
+    "baseTypes": {
       "patterns": [
         {
-          "comment": "EndState statement",
-          "name": "meta.endstate.papyrus",
-          "begin": "(?i)^\\s*(endstate)\\b",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.papyrus"
-            }
-          },
-          "end": "([\\n\\r])",
-          "patterns": [
-            {
-              "include": "#endOfLine"
-            }
-          ]
+          "name": "storage.type.papyrus",
+          "match": "(?i)\\b(bool|float|int|string)\\b"
         }
       ]
     },
-    "property": {
+    "bool": {
       "patterns": [
         {
-          "comment": "Property declaration",
-          "name": "meta.property.papyrus",
-          "begin": "(?i)^\\s*([_a-z][0-9_a-z]*)(?:\\[\\])?\\s+(property)\\s+",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.papyrus"
-            },
-            "2": {
-              "name": "keyword.other.papyrus"
-            }
-          },
-          "end": "([\\n\\r])",
-          "patterns": [
-            {
-              "comment": "Assignment operator",
-              "name": "keyword.operator.assignment.papyrus",
-              "match": "(\\=)"
-            },
-            {
-              "include": "#constants"
-            },
-            {
-              "include": "#propertyFlags"
-            },
-            {
-              "include": "#illegalKeywords"
-            },
-            {
-              "include": "#illegalSpecialVariables"
-            },
-            {
-              "include": "#illegalBaseTypes"
-            },
-            {
-              "include": "#identifier"
-            },
-            {
-              "include": "#endOfLine"
-            }
-          ]
+          "name": "constant.language.boolean.papyrus",
+          "match": "(?i)\\b(true|false|none)\\b"
         }
       ]
     },
-    "propertyFlags": {
+    "boolExpression": {
       "patterns": [
         {
-          "comment": "Property flags",
-          "name": "keyword.other.papyrus",
-          "match": "(?i)\\b(auto|autoreadonly|conditional|hidden)\\b"
+          "name": "keyword.operator.papyrus",
+          "match": "(\\=\\=|\\!\\=|\\\u003c\\=|\\\u003e\\=|\\\u003c|\\\u003e)"
+        },
+        {
+          "include": "#addExpression"
         }
       ]
     },
-    "endProperty": {
+    "brackets": {
       "patterns": [
         {
-          "comment": "EndProperty statement",
-          "name": "meta.endproperty.papyrus",
-          "begin": "(?i)^\\s*(endproperty)\\b",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.papyrus"
-            }
-          },
-          "end": "([\\n\\r])",
-          "patterns": [
-            {
-              "include": "#endOfLine"
-            }
-          ]
+          "name": "meta.array.papyrus",
+          "match": "\\[\\]"
         }
       ]
     },
-    "function": {
+    "castAtom": {
       "patterns": [
         {
-          "comment": "Function declaration",
-          "name": "meta.function.papyrus",
-          "begin": "(?i)^\\s*(?:([_a-z][0-9_a-z]*)(?:\\[\\])?\\s+)?(function)\\s+",
-          "beginCaptures": {
+          "name": "meta.cast.papyrus",
+          "match": "(?i)\\b(as)\\s+([_a-z][0-9_a-z]*)\\b",
+          "captures": {
             "1": {
-              "name": "storage.type.papyrus"
+              "name": "keyword.operator.papyrus"
             },
             "2": {
-              "name": "keyword.control.functionstart.papyrus"
-            },
-            "3": {
-              "name": "entity.name.function.papyrus"
+              "name": "storage.type.papyrus"
             }
-          },
-          "end": "([\\n\\r])",
-          "patterns": [
-            {
-              "include": "#functionParameters"
-            },
-            {
-              "include": "#functionFlags"
-            },
-            {
-              "include": "#illegalKeywords"
-            },
-            {
-              "include": "#illegalSpecialVariables"
-            },
-            {
-              "include": "#illegalBaseTypes"
-            },
-            {
-              "include": "#functionIdentifier"
-            },
-            {
-              "include": "#endOfLine"
-            }
-          ]
-        }
-      ]
-    },
-    "functionParameters": {
-      "patterns": [
-        {
-          "comment": "Function parameters",
-          "name": "meta.functionparameters.papyrus",
-          "begin": "\\(",
-          "end": "\\)",
-          "patterns": [
-            {
-              "comment": "Assignment operator",
-              "name": "keyword.operator.assignment.papyrus",
-              "match": "(\\=)"
-            },
-            {
-              "include": "#constants"
-            },
-            {
-              "include": "#illegalKeywords"
-            },
-            {
-              "include": "#illegalSpecialVariables"
-            },
-            {
-              "include": "#functionParameter"
-            },
-            {
-              "include": "#comma"
-            },
-            {
-              "include": "#multiline"
-            },
-            {
-              "include": "#whitespace"
-            },
-            {
-              "include": "#unmatched"
-            }
-          ]
-        }
-      ]
-    },
-    "functionParameter": {
-      "patterns": [
-        {
-          "include": "#functionParameterIdentifier"
-        },
-        {
-          "include": "#typeIdentifier"
+          }
         },
         {
-          "include": "#brackets"
+          "include": "#dotAtom"
         }
       ]
     },
-    "functionParameterIdentifier": {
+    "comma": {
       "patterns": [
         {
-          "comment": "Event parameter identifier",
-          "name": "variable.parameter.papyrus",
-          "match": "(?i)\\b([_a-z][0-9_a-z]*)\\s*(?=(\\,|\\)|\\=))"
+          "name": "meta.comma.papyrus",
+          "match": "\\,"
         }
       ]
     },
-    "functionFlags": {
+    "commentBlock": {
       "patterns": [
         {
-          "comment": "Function flags",
-          "name": "keyword.other.papyrus",
-          "match": "(?i)\\b(native|global)\\b"
+          "name": "comment.block.papyrus",
+          "begin": ";/",
+          "end": "/;"
         }
       ]
     },
-    "endFunction": {
+    "commentDocumentation": {
       "patterns": [
         {
-          "comment": "EndFunction statement",
-          "name": "meta.endfunction.papyrus",
-          "begin": "(?i)^\\s*(endfunction)\\b",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.papyrus"
-            }
-          },
-          "end": "([\\n\\r])",
-          "patterns": [
-            {
-              "include": "#endOfLine"
-            }
-          ]
+          "name": "comment.documentation.papyrus",
+          "begin": "^\\s*\\{",
+          "end": "\\}"
         }
       ]
     },
-    "event": {
+    "commentLine": {
       "patterns": [
         {
-          "comment": "Event declaration",
-          "name": "meta.event.papyrus",
-          "begin": "(?i)^\\s*(event)\\s+",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.eventstart.papyrus"
-            },
-            "2": {
-              "name": "entity.name.function.papyrus"
-            }
-          },
-          "end": "([\\n\\r])",
-          "patterns": [
-            {
-              "include": "#eventParameters"
-            },
-            {
-              "include": "#eventFlags"
-            },
-            {
-              "include": "#illegalKeywords"
-            },
-            {
-              "include": "#illegalSpecialVariables"
-            },
-            {
-              "include": "#illegalBaseTypes"
-            },
-            {
-              "include": "#functionIdentifier"
-            },
-            {
-              "include": "#endOfLine"
-            }
-          ]
+          "name": "comment.line.papyrus",
+          "match": ";.*$"
         }
       ]
     },
-    "eventParameters": {
+    "comments": {
       "patterns": [
         {
-          "comment": "Event parameters",
-          "name": "meta.eventparameters.papyrus",
-          "begin": "\\(",
-          "end": "\\)",
-          "patterns": [
-            {
-              "include": "#illegalKeywords"
-            },
-            {
-              "include": "#illegalSpecialVariables"
-            },
-            {
-              "include": "#eventParameter"
-            },
-            {
-              "include": "#comma"
-            },
-            {
-              "include": "#multiline"
-            },
-            {
-              "include": "#whitespace"
-            },
-            {
-              "include": "#unmatched"
-            }
-          ]
+          "include": "#commentBlock"
+        },
+        {
+          "include": "#commentLine"
+        },
+        {
+          "include": "#commentDocumentation"
         }
       ]
     },
-    "eventParameter": {
+    "constants": {
       "patterns": [
         {
-          "include": "#eventParameterIdentifier"
+          "include": "#bool"
         },
         {
-          "include": "#typeIdentifier"
+          "include": "#float"
         },
         {
-          "include": "#brackets"
-        }
-      ]
-    },
-    "eventParameterIdentifier": {
-      "patterns": [
+          "include": "#integer"
+        },
         {
-          "comment": "Event parameter identifier",
-          "name": "variable.parameter.papyrus",
-          "match": "(?i)\\b([_a-z][0-9_a-z]*)\\s*(?=(\\,|\\)))"
+          "include": "#string"
         }
       ]
     },
-    "eventFlags": {
+    "dotAtom": {
       "patterns": [
         {
-          "comment": "Event flags",
-          "name": "keyword.other.papyrus",
-          "match": "(?i)(?<=\\))\\s*(native)\\b"
+          "name": "keyword.operator.papyrus",
+          "match": "\\."
+        },
+        {
+          "include": "#constants"
+        },
+        {
+          "include": "#arrayAtom"
+        },
+        {
+          "include": "#arrayFuncOrId"
         }
       ]
     },
-    "endEvent": {
+    "else": {
       "patterns": [
         {
-          "comment": "EndEvent statement",
-          "name": "meta.endevent.papyrus",
-          "begin": "(?i)^\\s*(endevent)\\b",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.papyrus"
-            }
-          },
+          "name": "meta.else.papyrus",
+          "begin": "(?i)^\\s*(else)\\b",
           "end": "([\\n\\r])",
           "patterns": [
             {
               "include": "#endOfLine"
             }
-          ]
-        }
-      ]
-    },
-    "return": {
-      "patterns": [
-        {
-          "comment": "Return statements",
-          "name": "meta.return.papyrus",
-          "begin": "(?i)^\\s*(return)\\b",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.other.papyrus"
             }
-          },
-          "end": "([\\n\\r])",
-          "patterns": [
-            {
-              "include": "#expression"
-            },
-            {
-              "include": "#endOfLine"
-            }
-          ]
+          }
         }
       ]
     },
-    "if": {
+    "elseif": {
       "patterns": [
         {
-          "comment": "If statement",
-          "name": "meta.if.papyrus",
-          "begin": "(?i)^\\s*(if)\\b",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.papyrus"
-            }
-          },
+          "name": "meta.elseif.papyrus",
+          "begin": "(?i)^\\s*(elseif)\\b",
           "end": "([\\n\\r])",
           "patterns": [
             {
@@ -656,588 +368,778 @@
             {
               "include": "#endOfLine"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.papyrus"
+            }
+          }
         }
       ]
     },
-    "elseif": {
+    "endEvent": {
       "patterns": [
         {
-          "comment": "ElseIf statement",
-          "name": "meta.elseif.papyrus",
-          "begin": "(?i)^\\s*(elseif)\\b",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.papyrus"
-            }
-          },
+          "name": "meta.endevent.papyrus",
+          "begin": "(?i)^\\s*(endevent)\\b",
           "end": "([\\n\\r])",
           "patterns": [
-            {
-              "include": "#expression"
-            },
             {
               "include": "#endOfLine"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.papyrus"
+            }
+          }
         }
       ]
     },
-    "else": {
+    "endFunction": {
       "patterns": [
         {
-          "comment": "Else statement",
-          "name": "meta.else.papyrus",
-          "begin": "(?i)^\\s*(else)\\b",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.papyrus"
-            }
-          },
+          "name": "meta.endfunction.papyrus",
+          "begin": "(?i)^\\s*(endfunction)\\b",
           "end": "([\\n\\r])",
           "patterns": [
             {
               "include": "#endOfLine"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.papyrus"
+            }
+          }
         }
       ]
     },
     "endIf": {
       "patterns": [
         {
-          "comment": "EndIf statement",
           "name": "meta.endif.papyrus",
           "begin": "(?i)^\\s*(endif)\\b",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.papyrus"
-            }
-          },
           "end": "([\\n\\r])",
           "patterns": [
             {
               "include": "#endOfLine"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.papyrus"
+            }
+          }
         }
       ]
     },
-    "while": {
+    "endOfLine": {
       "patterns": [
         {
-          "comment": "While statement",
-          "name": "meta.while.papyrus",
-          "begin": "(?i)^\\s*(while)\\b",
+          "include": "#commentBlock"
+        },
+        {
+          "include": "#commentLine"
+        },
+        {
+          "include": "#whitespace"
+        },
+        {
+          "include": "#multiline"
+        },
+        {
+          "include": "#unmatched"
+        }
+      ]
+    },
+    "endProperty": {
+      "patterns": [
+        {
+          "name": "meta.endproperty.papyrus",
+          "begin": "(?i)^\\s*(endproperty)\\b",
+          "end": "([\\n\\r])",
+          "patterns": [
+            {
+              "include": "#endOfLine"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.other.papyrus"
             }
-          },
+          }
+        }
+      ]
+    },
+    "endState": {
+      "patterns": [
+        {
+          "name": "meta.endstate.papyrus",
+          "begin": "(?i)^\\s*(endstate)\\b",
           "end": "([\\n\\r])",
           "patterns": [
-            {
-              "include": "#expression"
-            },
             {
               "include": "#endOfLine"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.papyrus"
+            }
+          }
         }
       ]
     },
     "endWhile": {
       "patterns": [
         {
-          "comment": "EndWhile statement",
           "name": "meta.endwhile.papyrus",
           "begin": "(?i)^\\s*(endwhile)\\b",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.papyrus"
-            }
-          },
           "end": "([\\n\\r])",
           "patterns": [
             {
               "include": "#endOfLine"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.papyrus"
+            }
+          }
         }
       ]
     },
-    "variable": {
+    "event": {
       "patterns": [
         {
-          "comment": "Variable declaration with a default value",
-          "name": "meta.variable.papyrus",
-          "begin": "(?i)^\\s*([_a-z][0-9_a-z]*)(?:\\[\\])?\\s+([_a-z][0-9_a-z]*)(?:\\s*(\\=)\\s*)",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.papyrus"
-            },
-            "2": {
-              "name": "variable.other.papyrus"
-            },
-            "3": {
-              "name": "keyword.operator.papyrus"
-            }
-          },
+          "name": "meta.event.papyrus",
+          "begin": "(?i)^\\s*(event)\\s+",
           "end": "([\\n\\r])",
           "patterns": [
             {
-              "include": "#constants"
+              "include": "#eventParameters"
             },
             {
-              "name": "keyword.other.papyrus",
-              "match": "(?i)(?:\\b(conditional)\\b)"
+              "include": "#eventFlags"
             },
             {
-              "include": "#expression"
+              "include": "#illegalKeywords"
+            },
+            {
+              "include": "#illegalSpecialVariables"
+            },
+            {
+              "include": "#illegalBaseTypes"
+            },
+            {
+              "include": "#functionIdentifier"
             },
             {
               "include": "#endOfLine"
             }
-          ]
-        },
-        {
-          "comment": "Scriptwide variable declaration without a default value",
-          "name": "meta.variable.papyrus",
-          "begin": "(?i)^\\s*([_a-z][0-9_a-z]*)(?:\\[\\])?\\s+([_a-z][0-9_a-z]*)(?:\\s+(conditional)\\b)?",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "storage.type.papyrus"
+              "name": "keyword.control.eventstart.papyrus"
             },
             "2": {
-              "name": "variable.other.papyrus"
-            },
-            "3": {
-              "name": "keyword.other.papyrus"
-            }
-          },
-          "end": "([\\n\\r])",
-          "patterns": [
-            {
-              "include": "#endOfLine"
+              "name": "entity.name.function.papyrus"
             }
-          ]
+          }
         }
       ]
     },
-    "expression": {
+    "eventFlags": {
       "patterns": [
         {
-          "comment": "OR",
-          "name": "keyword.operator.papyrus",
-          "match": "\\|\\|"
-        },
-        {
-          "include": "#andExpression"
-        },
-        {
-          "include": "#endOfLine"
+          "name": "keyword.other.papyrus",
+          "match": "(?i)(?\u003c=\\))\\s*(native)\\b"
         }
       ]
     },
-    "andExpression": {
+    "eventParameter": {
       "patterns": [
         {
-          "comment": "AND",
-          "name": "keyword.operator.papyrus",
-          "match": "\\&\\&"
+          "include": "#eventParameterIdentifier"
         },
         {
-          "include": "#boolExpression"
+          "include": "#typeIdentifier"
+        },
+        {
+          "include": "#brackets"
         }
       ]
     },
-    "boolExpression": {
+    "eventParameterIdentifier": {
       "patterns": [
         {
-          "comment": "Comparison operators",
-          "name": "keyword.operator.papyrus",
-          "match": "(\\=\\=|\\!\\=|\\<\\=|\\>\\=|\\<|\\>)"
-        },
-        {
-          "include": "#addExpression"
+          "name": "variable.parameter.papyrus",
+          "match": "(?i)\\b([_a-z][0-9_a-z]*)\\s*(?=(\\,|\\)))"
         }
       ]
     },
-    "addExpression": {
+    "eventParameters": {
       "patterns": [
         {
-          "comment": "Addition or subtraction",
-          "name": "keyword.operator.papyrus",
-          "match": "(\\+|\\-)"
-        },
-        {
-          "include": "#multExpression"
+          "name": "meta.eventparameters.papyrus",
+          "begin": "\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#illegalKeywords"
+            },
+            {
+              "include": "#illegalSpecialVariables"
+            },
+            {
+              "include": "#eventParameter"
+            },
+            {
+              "include": "#comma"
+            },
+            {
+              "include": "#multiline"
+            },
+            {
+              "include": "#whitespace"
+            },
+            {
+              "include": "#unmatched"
+            }
+          ]
         }
       ]
     },
-    "multExpression": {
+    "expression": {
       "patterns": [
         {
-          "comment": "Multiplication, division, or modulus",
           "name": "keyword.operator.papyrus",
-          "match": "(\\*|/|\\%)"
+          "match": "\\|\\|"
         },
         {
-          "include": "#unaryExpression"
+          "include": "#andExpression"
+        },
+        {
+          "include": "#endOfLine"
         }
       ]
     },
-    "unaryExpression": {
+    "float": {
       "patterns": [
         {
-          "comment": "Unary minus or NOT",
-          "name": "keyword.operator.papyrus",
-          "match": "(\\-|\\!)"
+          "include": "#unaryMinus"
         },
         {
-          "include": "#castAtom"
+          "name": "constant.numeric.float.papyrus",
+          "match": "\\b(\\d+\\.\\d+)\\b"
         }
       ]
     },
-    "castAtom": {
+    "funcOrId": {
       "patterns": [
         {
-          "comment": "Cast",
-          "name": "meta.cast.papyrus",
-          "match": "(?i)\\b(as)\\s+([_a-z][0-9_a-z]*)\\b",
-          "captures": {
-            "1": {
-              "name": "keyword.operator.papyrus"
-            },
-            "2": {
-              "name": "storage.type.papyrus"
-            }
-          }
+          "name": "keyword.other.papyrus",
+          "match": "(?i)\\b(length)\\b"
         },
         {
-          "include": "#dotAtom"
-        }
-      ]
-    },
-    "dotAtom": {
-      "patterns": [
+          "include": "#functionCall"
+        },
         {
-          "comment": "Dot",
-          "name": "keyword.operator.papyrus",
-          "match": "\\."
+          "include": "#illegalKeywords"
         },
         {
-          "include": "#constants"
+          "include": "#illegalBaseTypes"
         },
         {
-          "include": "#arrayAtom"
+          "include": "#specialVariables"
         },
         {
-          "include": "#arrayFuncOrId"
+          "include": "#identifier"
         }
       ]
     },
-    "arrayAtom": {
+    "function": {
       "patterns": [
         {
-          "comment": "Array",
-          "name": "meta.array.papyrus",
-          "begin": "\\[",
-          "end": "\\]",
+          "name": "meta.function.papyrus",
+          "begin": "(?i)^\\s*(?:([_a-z][0-9_a-z]*)(?:\\[\\])?\\s+)?(function)\\s+",
+          "end": "([\\n\\r])",
           "patterns": [
             {
-              "include": "#expression"
+              "include": "#functionParameters"
+            },
+            {
+              "include": "#functionFlags"
+            },
+            {
+              "include": "#illegalKeywords"
+            },
+            {
+              "include": "#illegalSpecialVariables"
+            },
+            {
+              "include": "#illegalBaseTypes"
+            },
+            {
+              "include": "#functionIdentifier"
+            },
+            {
+              "include": "#endOfLine"
             }
-          ]
-        },
-        {
-          "include": "#atom"
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.papyrus"
+            },
+            "2": {
+              "name": "keyword.control.functionstart.papyrus"
+            },
+            "3": {
+              "name": "entity.name.function.papyrus"
+            }
+          }
         }
       ]
     },
-    "atom": {
+    "functionCall": {
       "patterns": [
         {
-          "comment": "New array",
-          "name": "meta.newarray.papyrus",
-          "begin": "(?i)\\b(new)\\s+([_a-z][0-9_a-z]*)\\[",
+          "name": "meta.functioncall.papyrus",
+          "begin": "(?i)\\b([_a-z][0-9_a-z]*)\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#functionCallParameters"
+            }
+          ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.operator.papyrus"
-            },
-            "2": {
-              "name": "storage.type.papyrus"
+              "name": "variable.other.papyrus"
             }
-          },
-          "end": "\\]",
-          "patterns": [
-            {
-              "include": "#integer"
+          }
+        }
+      ]
+    },
+    "functionCallParameter": {
+      "patterns": [
+        {
+          "name": "meta.functioncallparameter.papyrus",
+          "match": "(?i)\\b(?:([_a-z][0-9_a-z]*)\\s*(\\=)(?!\\=))?",
+          "captures": {
+            "1": {
+              "name": "variable.parameter.papyrus"
+            },
+            "2": {
+              "name": "keyword.operator.papyrus"
             }
-          ]
+          }
         },
         {
-          "comment": "Parenthesis",
-          "name": "meta.parenthesis.papyrus",
-          "begin": "\\(",
-          "end": "(\\)|[\\n\\r])",
-          "patterns": [
-            {
-              "include": "#expression"
-            }
-          ]
+          "include": "#expression"
+        }
+      ]
+    },
+    "functionCallParameters": {
+      "patterns": [
+        {
+          "include": "#comma"
         },
         {
-          "include": "#funcOrId"
+          "include": "#functionCallParameter"
         }
       ]
     },
-    "funcOrId": {
+    "functionFlags": {
       "patterns": [
         {
-          "comment": "Length",
           "name": "keyword.other.papyrus",
-          "match": "(?i)\\b(length)\\b"
-        },
+          "match": "(?i)\\b(native|global)\\b"
+        }
+      ]
+    },
+    "functionIdentifier": {
+      "patterns": [
         {
-          "include": "#functionCall"
-        },
+          "name": "entity.name.function.papyrus",
+          "match": "(?i)\\b([_a-z][0-9_a-z]*)\\s*(?=\\()"
+        }
+      ]
+    },
+    "functionParameter": {
+      "patterns": [
         {
-          "include": "#illegalKeywords"
+          "include": "#functionParameterIdentifier"
         },
         {
-          "include": "#illegalBaseTypes"
+          "include": "#typeIdentifier"
         },
         {
-          "include": "#specialVariables"
-        },
+          "include": "#brackets"
+        }
+      ]
+    },
+    "functionParameterIdentifier": {
+      "patterns": [
         {
-          "include": "#identifier"
+          "name": "variable.parameter.papyrus",
+          "match": "(?i)\\b([_a-z][0-9_a-z]*)\\s*(?=(\\,|\\)|\\=))"
         }
       ]
     },
-    "functionCall": {
+    "functionParameters": {
       "patterns": [
         {
-          "comment": "Function call",
-          "name": "meta.functioncall.papyrus",
-          "begin": "(?i)\\b([_a-z][0-9_a-z]*)\\(",
-          "beginCaptures": {
-            "1": {
-              "name": "variable.other.papyrus"
-            }
-          },
+          "name": "meta.functionparameters.papyrus",
+          "begin": "\\(",
           "end": "\\)",
           "patterns": [
             {
-              "include": "#functionCallParameters"
+              "name": "keyword.operator.assignment.papyrus",
+              "match": "(\\=)"
+            },
+            {
+              "include": "#constants"
+            },
+            {
+              "include": "#illegalKeywords"
+            },
+            {
+              "include": "#illegalSpecialVariables"
+            },
+            {
+              "include": "#functionParameter"
+            },
+            {
+              "include": "#comma"
+            },
+            {
+              "include": "#multiline"
+            },
+            {
+              "include": "#whitespace"
+            },
+            {
+              "include": "#unmatched"
             }
           ]
         }
       ]
     },
-    "functionCallParameters": {
+    "identifier": {
       "patterns": [
         {
-          "include": "#comma"
-        },
-        {
-          "include": "#functionCallParameter"
+          "name": "variable.other.papyrus",
+          "match": "(?i)\\b([_a-z][0-9_a-z]*)\\b"
         }
       ]
     },
-    "functionCallParameter": {
+    "if": {
       "patterns": [
         {
-          "comment": "Specific parameter",
-          "name": "meta.functioncallparameter.papyrus",
-          "match": "(?i)\\b(?:([_a-z][0-9_a-z]*)\\s*(\\=)(?!\\=))?",
-          "captures": {
-            "1": {
-              "name": "variable.parameter.papyrus"
+          "name": "meta.if.papyrus",
+          "begin": "(?i)^\\s*(if)\\b",
+          "end": "([\\n\\r])",
+          "patterns": [
+            {
+              "include": "#expression"
             },
-            "2": {
-              "name": "keyword.operator.papyrus"
+            {
+              "include": "#endOfLine"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.papyrus"
             }
           }
-        },
+        }
+      ]
+    },
+    "illegalBaseTypes": {
+      "patterns": [
         {
-          "include": "#expression"
+          "name": "meta.invalid.papyrus",
+          "match": "(?i)\\b(bool|float|int|string)\\b"
         }
       ]
     },
-    "arrayFuncOrId": {
+    "illegalKeywords": {
       "patterns": [
         {
-          "include": "#funcOrId"
-        },
+          "name": "meta.invalid.papyrus",
+          "match": "(?i)\\b(as|auto|autoreadonly|else|elseif|endevent|endfunction|endif|endproperty|endstate|endwhile|event|extends|false|function|global|if|import|length|native|new|none|property|return|scriptname|state|true|while)\\b"
+        }
+      ]
+    },
+    "illegalSpecialVariables": {
+      "patterns": [
         {
-          "comment": "Array element access",
-          "name": "meta.arrayelement.papyrus",
-          "begin": "\\[",
-          "end": "\\]",
-          "patterns": [
-            {
-              "include": "#expression"
-            }
-          ]
+          "name": "meta.invalid.papyrus",
+          "match": "(?i)\\b(parent|self)\\b"
         }
       ]
     },
-    "assign": {
+    "import": {
       "patterns": [
         {
-          "comment": "Assign statement",
-          "name": "meta.assign.papyrus",
-          "begin": "^\\s*",
+          "name": "meta.import.papyrus",
+          "begin": "(?i)^\\s*(import)\\s+",
           "end": "([\\n\\r])",
           "patterns": [
             {
-              "include": "#assignmentOperators"
+              "include": "#illegalKeywords"
             },
             {
-              "include": "#expression"
+              "include": "#illegalSpecialVariables"
+            },
+            {
+              "include": "#illegalBaseTypes"
+            },
+            {
+              "include": "#typeIdentifier"
             },
             {
               "include": "#endOfLine"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.papyrus"
+            }
+          }
         }
       ]
     },
-    "assignmentOperators": {
+    "integer": {
       "patterns": [
         {
-          "comment": "Assignment operators",
-          "name": "keyword.operator.papyrus",
-          "match": "(\\=|\\+\\=|\\-\\=|\\*\\=|\\/\\=|\\%\\=)"
+          "include": "#unaryMinus"
+        },
+        {
+          "name": "constant.numeric.integer.papyrus",
+          "match": "(?i)\\b(0x[0-9a-f]+|\\d+)\\b"
         }
       ]
     },
-    "comma": {
+    "keywords": {
       "patterns": [
         {
-          "comment": "Comma",
-          "name": "meta.comma.papyrus",
-          "match": "\\,"
+          "name": "keyword.other.papyrus",
+          "match": "(?i)\\b(as|auto|autoreadonly|else|elseif|endevent|endfunction|endif|endproperty|endstate|endwhile|event|extends|false|function|global|if|import|length|native|new|none|property|return|scriptname|state|true|while)\\b"
         }
       ]
     },
-    "whitespace": {
+    "multExpression": {
       "patterns": [
         {
-          "comment": "Whitespace",
-          "name": "meta.whitespace.papyrus",
-          "match": "([ \\t])"
+          "name": "keyword.operator.papyrus",
+          "match": "(\\*|/|\\%)"
+        },
+        {
+          "include": "#unaryExpression"
         }
       ]
     },
     "multiline": {
       "patterns": [
         {
-          "comment": "Multiline",
           "name": "meta.multiline.papyrus",
           "begin": "\\\\",
+          "end": "([\\n\\r])",
+          "patterns": [
+            {
+              "include": "#commentBlock"
+            },
+            {
+              "include": "#commentLine"
+            },
+            {
+              "include": "#whitespace"
+            },
+            {
+              "include": "#unmatched"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "keyword.operator.papyrus"
             }
-          },
+          }
+        }
+      ]
+    },
+    "parameterIdentifier": {
+      "patterns": [
+        {
+          "name": "variable.parameter.papyrus",
+          "match": "(?i)\\b([_a-z][0-9_a-z]*)\\b"
+        }
+      ]
+    },
+    "property": {
+      "patterns": [
+        {
+          "name": "meta.property.papyrus",
+          "begin": "(?i)^\\s*([_a-z][0-9_a-z]*)(?:\\[\\])?\\s+(property)\\s+",
           "end": "([\\n\\r])",
           "patterns": [
             {
-              "include": "#commentBlock"
+              "name": "keyword.operator.assignment.papyrus",
+              "match": "(\\=)"
             },
             {
-              "include": "#commentLine"
+              "include": "#constants"
             },
             {
-              "include": "#whitespace"
+              "include": "#propertyFlags"
+            },
+            {
+              "include": "#illegalKeywords"
+            },
+            {
+              "include": "#illegalSpecialVariables"
+            },
+            {
+              "include": "#illegalBaseTypes"
+            },
+            {
+              "include": "#identifier"
+            },
+            {
+              "include": "#endOfLine"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.papyrus"
             },
-            {
-              "include": "#unmatched"
+            "2": {
+              "name": "keyword.other.papyrus"
             }
-          ]
-        }
-      ]
-    },
-    "unmatched": {
-      "patterns": [
-        {
-          "comment": "Unmatched",
-          "name": "meta.invalid.papyrus",
-          "match": "([^\\n\\r])"
+          }
         }
       ]
     },
-    "unaryMinus": {
+    "propertyFlags": {
       "patterns": [
         {
-          "comment": "Unary minus",
-          "name": "keyword.operator.papyrus",
-          "match": "\\-(?=\\d)"
+          "name": "keyword.other.papyrus",
+          "match": "(?i)\\b(auto|autoreadonly|conditional|hidden)\\b"
         }
       ]
     },
-    "constants": {
+    "return": {
       "patterns": [
         {
-          "include": "#bool"
-        },
-        {
-          "include": "#float"
-        },
-        {
-          "include": "#integer"
-        },
-        {
-          "include": "#string"
+          "name": "meta.return.papyrus",
+          "begin": "(?i)^\\s*(return)\\b",
+          "end": "([\\n\\r])",
+          "patterns": [
+            {
+              "include": "#expression"
+            },
+            {
+              "include": "#endOfLine"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.papyrus"
+            }
+          }
         }
       ]
     },
-    "bool": {
+    "scriptHeader": {
       "patterns": [
         {
-          "comment": "Boolean literal",
-          "name": "constant.language.boolean.papyrus",
-          "match": "(?i)\\b(true|false|none)\\b"
+          "name": "meta.scriptheader.papyrus",
+          "begin": "(?i)^\\s*(scriptname)\\s+",
+          "end": "([\\n\\r])",
+          "patterns": [
+            {
+              "name": "keyword.other.papyrus",
+              "match": "(?i)\\b(extends)\\b"
+            },
+            {
+              "name": "keyword.other.papyrus",
+              "match": "(?i)\\b(hidden|conditional)\\b"
+            },
+            {
+              "include": "#illegalKeywords"
+            },
+            {
+              "include": "#illegalSpecialVariables"
+            },
+            {
+              "include": "#illegalBaseTypes"
+            },
+            {
+              "include": "#typeIdentifier"
+            },
+            {
+              "include": "#endOfLine"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.papyrus"
+            }
+          }
         }
       ]
     },
-    "float": {
+    "specialVariables": {
       "patterns": [
         {
-          "include": "#unaryMinus"
-        },
-        {
-          "comment": "Float literal",
-          "name": "constant.numeric.float.papyrus",
-          "match": "\\b(\\d+\\.\\d+)\\b"
+          "name": "keyword.other.papyrus",
+          "match": "(?i)\\b(parent|self)\\b"
         }
       ]
     },
-    "integer": {
+    "state": {
       "patterns": [
         {
-          "include": "#unaryMinus"
-        },
-        {
-          "comment": "Integer literal",
-          "name": "constant.numeric.integer.papyrus",
-          "match": "(?i)\\b(0x[0-9a-f]+|\\d+)\\b"
+          "name": "meta.state.papyrus",
+          "begin": "(?i)^\\s*(?:(auto)\\s+)?(state)\\s+",
+          "end": "([\\n\\r])",
+          "patterns": [
+            {
+              "include": "#illegalKeywords"
+            },
+            {
+              "include": "#illegalSpecialVariables"
+            },
+            {
+              "include": "#illegalBaseTypes"
+            },
+            {
+              "include": "#identifier"
+            },
+            {
+              "include": "#endOfLine"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.papyrus"
+            },
+            "2": {
+              "name": "keyword.other.papyrus"
+            }
+          }
         }
       ]
     },
     "string": {
       "patterns": [
         {
-          "comment": "String literal",
           "name": "string.quoted.double",
           "begin": "\\\"",
           "end": "\\\"",
           "patterns": [
             {
-              "comment": "Escape sequences",
               "name": "constant.character.escape.papyrus",
               "match": "(\\\\.)"
             }
@@ -1245,104 +1147,126 @@
         }
       ]
     },
-    "keywords": {
-      "patterns": [
-        {
-          "comment": "Keywords",
-          "name": "keyword.other.papyrus",
-          "match": "(?i)\\b(as|auto|autoreadonly|else|elseif|endevent|endfunction|endif|endproperty|endstate|endwhile|event|extends|false|function|global|if|import|length|native|new|none|property|return|scriptname|state|true|while)\\b"
-        }
-      ]
-    },
-    "illegalKeywords": {
+    "typeIdentifier": {
       "patterns": [
         {
-          "comment": "Keywords",
-          "name": "meta.invalid.papyrus",
-          "match": "(?i)\\b(as|auto|autoreadonly|else|elseif|endevent|endfunction|endif|endproperty|endstate|endwhile|event|extends|false|function|global|if|import|length|native|new|none|property|return|scriptname|state|true|while)\\b"
+          "name": "storage.type.papyrus",
+          "match": "(?i)\\b([_a-z][0-9_a-z]*)\\b"
         }
       ]
     },
-    "specialVariables": {
+    "unaryExpression": {
       "patterns": [
         {
-          "comment": "Special variables",
-          "name": "keyword.other.papyrus",
-          "match": "(?i)\\b(parent|self)\\b"
-        }
-      ]
-    },
-    "illegalSpecialVariables": {
-      "patterns": [
+          "name": "keyword.operator.papyrus",
+          "match": "(\\-|\\!)"
+        },
         {
-          "comment": "Special variables",
-          "name": "meta.invalid.papyrus",
-          "match": "(?i)\\b(parent|self)\\b"
+          "include": "#castAtom"
         }
       ]
     },
-    "baseTypes": {
+    "unaryMinus": {
       "patterns": [
         {
-          "comment": "Type",
-          "name": "storage.type.papyrus",
-          "match": "(?i)\\b(bool|float|int|string)\\b"
+          "name": "keyword.operator.papyrus",
+          "match": "\\-(?=\\d)"
         }
       ]
     },
-    "illegalBaseTypes": {
+    "unmatched": {
       "patterns": [
         {
-          "comment": "Type",
           "name": "meta.invalid.papyrus",
-          "match": "(?i)\\b(bool|float|int|string)\\b"
-        }
-      ]
-    },
-    "identifier": {
-      "patterns": [
-        {
-          "comment": "Identifier",
-          "name": "variable.other.papyrus",
-          "match": "(?i)\\b([_a-z][0-9_a-z]*)\\b"
+          "match": "([^\\n\\r])"
         }
       ]
     },
-    "functionIdentifier": {
+    "variable": {
       "patterns": [
         {
-          "comment": "Function/event identifier",
-          "name": "entity.name.function.papyrus",
-          "match": "(?i)\\b([_a-z][0-9_a-z]*)\\s*(?=\\()"
-        }
-      ]
-    },
-    "typeIdentifier": {
-      "patterns": [
+          "name": "meta.variable.papyrus",
+          "begin": "(?i)^\\s*([_a-z][0-9_a-z]*)(?:\\[\\])?\\s+([_a-z][0-9_a-z]*)(?:\\s*(\\=)\\s*)",
+          "end": "([\\n\\r])",
+          "patterns": [
+            {
+              "include": "#constants"
+            },
+            {
+              "name": "keyword.other.papyrus",
+              "match": "(?i)(?:\\b(conditional)\\b)"
+            },
+            {
+              "include": "#expression"
+            },
+            {
+              "include": "#endOfLine"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.papyrus"
+            },
+            "2": {
+              "name": "variable.other.papyrus"
+            },
+            "3": {
+              "name": "keyword.operator.papyrus"
+            }
+          }
+        },
         {
-          "comment": "Type identifier",
-          "name": "storage.type.papyrus",
-          "match": "(?i)\\b([_a-z][0-9_a-z]*)\\b"
+          "name": "meta.variable.papyrus",
+          "begin": "(?i)^\\s*([_a-z][0-9_a-z]*)(?:\\[\\])?\\s+([_a-z][0-9_a-z]*)(?:\\s+(conditional)\\b)?",
+          "end": "([\\n\\r])",
+          "patterns": [
+            {
+              "include": "#endOfLine"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.papyrus"
+            },
+            "2": {
+              "name": "variable.other.papyrus"
+            },
+            "3": {
+              "name": "keyword.other.papyrus"
+            }
+          }
         }
       ]
     },
-    "parameterIdentifier": {
+    "while": {
       "patterns": [
         {
-          "comment": "Parameter identifier",
-          "name": "variable.parameter.papyrus",
-          "match": "(?i)\\b([_a-z][0-9_a-z]*)\\b"
+          "name": "meta.while.papyrus",
+          "begin": "(?i)^\\s*(while)\\b",
+          "end": "([\\n\\r])",
+          "patterns": [
+            {
+              "include": "#expression"
+            },
+            {
+              "include": "#endOfLine"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.papyrus"
+            }
+          }
         }
       ]
     },
-    "brackets": {
+    "whitespace": {
       "patterns": [
         {
-          "comment": "Brackets",
-          "name": "meta.array.papyrus",
-          "match": "\\[\\]"
+          "name": "meta.whitespace.papyrus",
+          "match": "([ \\t])"
         }
       ]
     }
   }
-}
+}