TM: remote function body scope, include all statements at top level

Author: cbuttner

syntaxes/c3.tmLanguage.json

@@ -10,6 +10,9 @@
   "patterns": [
     {
       "include": "#top_level"
+    },
+    {
+      "include": "#statements"
     }
   ],
   "repository": {
@@ -151,7 +154,7 @@
                   "include": "#attribute"
                 },
                 {
-                  "begin": "\\=",
+                  "begin": "=",
                   "beginCaptures": {
                     "0": {
                       "name": "keyword.operator.assignment.c3"
@@ -202,7 +205,7 @@
                   "include": "#attribute"
                 },
                 {
-                  "begin": "\\=",
+                  "begin": "=",
                   "beginCaptures": {
                     "0": {
                       "name": "keyword.operator.assignment.c3"
@@ -327,7 +330,7 @@
                   "include": "#comments"
                 },
                 {
-                  "begin": "\\=",
+                  "begin": "=",
                   "beginCaptures": {
                     "0": {
                       "name": "keyword.operator.assignment.c3"
@@ -417,7 +420,7 @@
                   "include": "#attribute"
                 },
                 {
-                  "begin": "\\=",
+                  "begin": "=",
                   "beginCaptures": {
                     "0": {
                       "name": "keyword.operator.assignment.c3"
@@ -495,7 +498,7 @@
                   ]
                 },
                 {
-                  "begin": "\\=",
+                  "begin": "=",
                   "beginCaptures": {
                     "0": {
                       "name": "keyword.operator.assignment.c3"
@@ -582,7 +585,7 @@
     "function_header": {
       "patterns": [
         {
-          "include": "#type"
+          "include": "#type_no_generics"
         },
         {
           "match": "\\.",
@@ -596,7 +599,7 @@
     },
     "function": {
       "begin": "(?=\\b(fn|macro)\\b)",
-      "end": "(?<=\\})|(?=[;,)])",
+      "end": "(?=[={;])",
       "patterns": [
         {
           "begin": "\\b(fn|macro)\\b",
@@ -648,41 +651,6 @@
               "include": "#attribute"
             }
           ]
-        },
-        {
-          "begin": "\\{",
-          "beginCaptures": {
-            "0": {
-              "name": "meta.function.c3 meta.block.c3 punctuation.section.block.begin.c3"
-            }
-          },
-          "end": "\\}",
-          "endCaptures": {
-            "0": {
-              "name": "meta.function.c3 meta.block.c3 punctuation.section.block.end.c3"
-            }
-          },
-          "contentName": "meta.function.c3 meta.block.c3",
-          "patterns": [
-            {
-              "include": "#statements"
-            }
-          ]
-        },
-        {
-          "begin": "\\=>",
-          "beginCaptures": {
-            "0": {
-              "name": "meta.function.c3 keyword.declaration.function.arrow.c3"
-            }
-          },
-          "end": "(?=[;,){])",
-          "contentName": "meta.function.c3",
-          "patterns": [
-            {
-              "include": "#expression"
-            }
-          ]
         }
       ]
     },
@@ -902,11 +870,15 @@
     "operators": {
       "patterns": [
         {
-          "match": "\\+\\=|-\\=|\\*\\=|/\\=|%\\=|&\\=|\\|\\=|\\^\\=|>>\\=|<<\\=",
+          "match": "=>",
+          "name": "keyword.declaration.function.arrow.c3"
+        },
+        {
+          "match": "\\+=|-=|\\*=|/=|%=|&=|\\|=|\\^=|>>=|<<=",
           "name": "keyword.operator.assignment.augmented.c3"
         },
         {
-          "match": "<\\=|>\\=|\\=\\=|<|>|\\!\\=",
+          "match": "<=|>=|==|<|>|\\!=",
           "name": "keyword.operator.comparison.c3"
         },
         {
@@ -930,7 +902,7 @@
           "name": "keyword.operator.arithmetic.c3"
         },
         {
-          "match": "\\=",
+          "match": "=",
           "name": "keyword.operator.assignment.c3"
         },
         {
@@ -1405,7 +1377,7 @@
           "include": "#attribute"
         },
         {
-          "begin": "\\=",
+          "begin": "=",
           "beginCaptures": {
             "0": {
               "name": "keyword.operator.assignment.c3"
@@ -1791,7 +1763,7 @@
               "include": "#attribute"
             },
             {
-              "begin": "\\=",
+              "begin": "=",
               "beginCaptures": {
                 "0": {
                   "name": "keyword.operator.assignment.c3"
@@ -1869,7 +1841,7 @@
               "name": "keyword.operator.variadic.c3"
             },
             {
-              "begin": "\\=",
+              "begin": "=",
               "beginCaptures": {
                 "0": {
                   "name": "keyword.operator.assignment.c3"

syntaxes/c3.tmLanguage.yml

@@ -10,6 +10,7 @@ scopeName: source.c3
 
 patterns:
   - include: "#top_level"
+  - include: "#statements"
 
 repository:
   top_level:
@@ -83,7 +84,7 @@ repository:
             patterns:
               - include: "#comments"
               - include: "#attribute"
-              - begin: \=
+              - begin: '='
                 beginCaptures:
                   0: { name: keyword.operator.assignment.c3 }
                 end: (?=;)
@@ -104,7 +105,7 @@ repository:
             patterns:
               - include: "#comments"
               - include: "#attribute"
-              - begin: \=
+              - begin: '='
                 beginCaptures:
                   0: { name: keyword.operator.assignment.c3 }
                 end: (?=;)
@@ -164,7 +165,7 @@ repository:
             contentName: meta.enum.body.c3 meta.block.c3
             patterns:
               - include: "#comments"
-              - begin: \=
+              - begin: '='
                 beginCaptures:
                   0: { name: keyword.operator.assignment.c3 }
                 end: (?=,)
@@ -207,7 +208,7 @@ repository:
             patterns:
               - include: "#comments"
               - include: "#attribute"
-              - begin: \=
+              - begin: '='
                 beginCaptures:
                   0: { name: keyword.operator.assignment.c3 }
                 end: (?=;)
@@ -243,7 +244,7 @@ repository:
                 contentName: meta.attrdef.parameters.c3 meta.group.c3
                 patterns:
                   - include: "#parameters"
-              - begin: \=
+              - begin: '='
                 beginCaptures:
                   0: { name: keyword.operator.assignment.c3 }
                 end: (?=;)
@@ -286,15 +287,15 @@ repository:
 
   function_header:
     patterns:
-      - include: "#type"
+      - include: "#type_no_generics"
       - match: '\.'
         name: punctuation.accessor.c3
       - match: '\@?{{IDENT}}'
         name: entity.name.function.c3
 
   function:
     begin: (?=\b(fn|macro)\b)
-    end: (?<=\})|(?=[;,)])
+    end: (?=[={;])
     patterns:
       # Before parameters
       - begin: \b(fn|macro)\b
@@ -322,23 +323,6 @@ repository:
         patterns:
           - include: "#comments"
           - include: "#attribute"
-      # Function  body
-      - begin: \{
-        beginCaptures:
-          0: { name: meta.function.c3 meta.block.c3 punctuation.section.block.begin.c3 }
-        end: \}
-        endCaptures:
-          0: { name: meta.function.c3 meta.block.c3 punctuation.section.block.end.c3 }
-        contentName: meta.function.c3 meta.block.c3
-        patterns:
-          - include: "#statements"
-      - begin: \=>
-        beginCaptures:
-          0: { name: meta.function.c3 keyword.declaration.function.arrow.c3 }
-        end: '(?=[;,){])'
-        contentName: meta.function.c3
-        patterns:
-          - include: "#expression"
 
   structlike:
     begin: '(?=\b(?:(struct|bitstruct)|(union))\b)'
@@ -448,9 +432,11 @@ repository:
 
   operators:
     patterns:
-      - match: '\+\=|-\=|\*\=|/\=|%\=|&\=|\|\=|\^\=|>>\=|<<\='
+      - match: '=>'
+        name: keyword.declaration.function.arrow.c3
+      - match: '\+=|-=|\*=|/=|%=|&=|\|=|\^=|>>=|<<='
         name: keyword.operator.assignment.augmented.c3
-      - match: '<\=|>\=|\=\=|<|>|\!\='
+      - match: '<=|>=|==|<|>|\!='
         name: keyword.operator.comparison.c3
       - match: '\.\.\.'
         name: keyword.operator.variadic.c3
@@ -462,7 +448,7 @@ repository:
         name: keyword.operator.arithmetic.c3
       - match: '\+|\-|/|%|\||\^|~'
         name: keyword.operator.arithmetic.c3
-      - match: '\='
+      - match: '='
         name: keyword.operator.assignment.c3
       - match: '!|\?[?:]?|\*|&|:'
         name: keyword.operator.c3
@@ -719,7 +705,7 @@ repository:
       - match: '\b{{CONST}}\b'
         name: variable.other.constant.c3
       - include: "#attribute"
-      - begin: \=
+      - begin: '='
         beginCaptures:
           0: { name: keyword.operator.assignment.c3 }
         end: (?=;)
@@ -910,7 +896,7 @@ repository:
           - include: "#comments"
           - include: "#attribute"
           # CT type parameter with default value
-          - begin: '\='
+          - begin: '='
             beginCaptures:
               0 : { name: keyword.operator.assignment.c3 }
             end: '(?=[;,)])'
@@ -947,7 +933,7 @@ repository:
           - match: '\.\.\.'
             name: keyword.operator.variadic.c3
           # Parameter with default value
-          - begin: '\='
+          - begin: '='
             beginCaptures:
               0 : { name: keyword.operator.assignment.c3 }
             end: '(?=[;,)])'