Revert "Fix incorrect coloring of the function suffixes - override, private/public, etc"

This reverts commit 05c71bd.

Author: e.guskov

syntaxes/dascript.tmLanguage.json

@@ -434,13 +434,13 @@
     },
     "function": {
       "name": "meta.function.dascript",
-      "begin": "(def)((?:\\s+(?:abstract|override|private|public|static))*)|(?:(?:\\s+\\S+)*)\\s+(?=[\\w]+\\s*\\()|(\\$)\\s*(?=\\[(?:.*?)\\])|(\\$)\\s*(?=\\()",
+      "begin": "(def)(\\s+(?:abstract|override)(?:private|public)(?:static))?\\s+(?=[\\w]+\\s*\\()|(\\$)\\s*(?=\\[(?:.*?)\\])|(\\$)\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.dascript"
         },
         "2": {
-          "name": "keyword.control.dascript"
+          "name": "storage.type.function.dascript"
         },
         "3": {
           "name": "storage.type.function.dascript"

syntaxes/dascript.tmLanguage.yaml

@@ -234,12 +234,12 @@ repository:
       - include: $self
   function:
     name: meta.function.dascript
-    begin: (def)((?:\s+(?:abstract|override|private|public|static))*)|(?:(?:\s+\S+)*)\s+(?=[\w]+\s*\()|(\$)\s*(?=\[(?:.*?)\])|(\$)\s*(?=\()
+    begin: (def)(\s+(?:abstract|override)(?:private|public)(?:static))?\s+(?=[\w]+\s*\()|(\$)\s*(?=\[(?:.*?)\])|(\$)\s*(?=\()
     beginCaptures:
       1:
         name: storage.type.function.dascript
       2:
-        name: keyword.control.dascript
+        name: storage.type.function.dascript
       3:
         name: storage.type.function.dascript
       4: