clientclassmethod

Author: daimor

src/providers/ObjectScriptClassSymbolProvider.ts

@@ -53,7 +53,7 @@ export class ObjectScriptClassSymbolProvider implements vscode.DocumentSymbolPro
           }
         }
 
-        const method = line.text.match(/^((?:Class|Client)?Method|Trigger|Query) (%?\b\w+\b|"[^"]+")/i);
+        const method = line.text.match(/^((?:Client)?(?:Class)?Method|Trigger|Query) (%?\b\w+\b|"[^"]+")/i);
         if (method) {
           let startCode = line.range.start;
           let end = line.range.end;

syntaxes/objectscript-class.tmLanguage.json

@@ -283,7 +283,7 @@
             }
         },
         {
-          "begin": "(?i)^(\\b(?:Class|Client)?Method\\b)(\\s+)((?:%?[a-zA-Z][0-9a-zA-Z]*(?:_[0-9a-zA-Z]+)*)|(?:\"[^\".]+\"))",
+          "begin": "(?i)^(\\b(?:Client)?(?:Class)?Method\\b)(\\s+)((?:%?[a-zA-Z][0-9a-zA-Z]*(?:_[0-9a-zA-Z]+)*)|(?:\"[^\".]+\"))",
           "beginCaptures": {
             "1": {
               "name": "keyword.objectscript_class"
@@ -358,7 +358,7 @@
           }
         },
         {
-          "begin": "(?i)^(\\XData\\b)(\\s+)(Style)",
+          "begin": "(?i)^(\\XData\\b)(\\s+)((?:SVG)?Style)",
           "beginCaptures": {
             "1": {
               "name": "keyword.objectscript_class"