TM: Fix function calls with generic args, named args, block precedence

cbuttner · cbuttner · commit 801df0d16834 · 2025-05-15T18:53:06.000+02:00
diff --git a/syntaxes/c3.tmLanguage.json b/syntaxes/c3.tmLanguage.json
@@ -1346,6 +1346,7 @@
               "name": "punctuation.terminator.c3"
             }
           },
+          "name": "meta.declaration.c3",
           "patterns": [
             {
               "match": "\\$(?:_*[A-Z][_A-Z0-9]*[a-z][_a-zA-Z0-9]*)",
@@ -1362,7 +1363,8 @@
           "endCaptures": {
             "0": {
               "name": "punctuation.terminator.c3"
-            }
+            },
+            "name": "meta.declaration.c3"
           },
           "patterns": [
             {
@@ -1384,6 +1386,7 @@
               "name": "punctuation.terminator.c3"
             }
           },
+          "name": "meta.declaration.c3",
           "patterns": [
             {
               "include": "#type"
@@ -1400,16 +1403,13 @@
         {
           "include": "#comments"
         },
-        {
-          "include": "#generic_params"
-        },
         {
           "match": "(?<!#)\\$?\\b(?:_*[a-z][_a-zA-Z0-9]*)\\b",
-          "name": "variable.other.c3"
+          "name": "variable.other.declaration.c3"
         },
         {
           "match": "\\b(?:_*[A-Z][_A-Z0-9]*)\\b",
-          "name": "variable.other.constant"
+          "name": "variable.other.constant.declaration.c3"
         },
         {
           "include": "#attribute"
@@ -1579,10 +1579,10 @@
           "include": "#declaration"
         },
         {
-          "include": "#expression"
+          "include": "#block"
         },
         {
-          "include": "#block"
+          "include": "#expression"
         }
       ]
     },
@@ -1634,9 +1634,6 @@
         {
           "include": "#brackets"
         },
-        {
-          "include": "#expression_block"
-        },
         {
           "include": "#initializer_list"
         },
@@ -1646,7 +1643,7 @@
       ]
     },
     "function_call": {
-      "begin": "([@#]?(?:_*[a-z][_a-zA-Z0-9]*))(?=\\s*\\((?!<))",
+      "begin": "([@#]?(?:_*[a-z][_a-zA-Z0-9]*)\\b)(?=\\s*(\\{.*\\})?\\s*\\()",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.c3"
@@ -1659,6 +1656,9 @@
         }
       },
       "patterns": [
+        {
+          "include": "#generic_params"
+        },
         {
           "begin": "\\(",
           "beginCaptures": {
@@ -1673,13 +1673,24 @@
               "include": "#comments"
             },
             {
-              "match": "(?<=[(\\s,])(\\.)([$#]?(?:_*[a-z][_a-zA-Z0-9]*))",
+              "match": "([$#]?(?:_*[a-z][_a-zA-Z0-9]*))\\s*(:(?!:))",
               "captures": {
                 "1": {
-                  "name": "punctuation.separator.c3"
+                  "name": "variable.parameter.c3"
                 },
                 "2": {
+                  "name": "punctuation.separator.c3"
+                }
+              }
+            },
+            {
+              "match": "(\\$(?:_*[A-Z][_A-Z0-9]*[a-z][_a-zA-Z0-9]*))\\s*(:(?!:))",
+              "captures": {
+                "1": {
                   "name": "variable.parameter.c3"
+                },
+                "2": {
+                  "name": "punctuation.separator.c3"
                 }
               }
             },
@@ -1700,13 +1711,13 @@
     "block": {
       "patterns": [
         {
-          "begin": "\\{(?!\\|)",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "meta.block.c3 punctuation.section.block.begin.c3"
             }
           },
-          "end": "(?<!\\|)\\}",
+          "end": "\\}",
           "endCaptures": {
             "0": {
               "name": "meta.block.c3 punctuation.section.block.end.c3"
@@ -1893,7 +1904,7 @@
               "name": "meta.block.c3 punctuation.section.block.end.c3"
             }
           },
-          "contentName": "meta.block.c3",
+          "contentName": "meta.block.c3 meta.initializer_list.c3",
           "patterns": [
             {
               "include": "#expression"
diff --git a/syntaxes/c3.tmLanguage.yml b/syntaxes/c3.tmLanguage.yml
@@ -691,6 +691,7 @@ repository:
         end: ;
         endCaptures:
           0: { name: punctuation.terminator.c3 }
+        name: 'meta.declaration.c3'
         patterns:
           # CT type
           - match: '\${{TYPE}}'
@@ -700,6 +701,7 @@ repository:
         end: ;
         endCaptures:
           0: { name: punctuation.terminator.c3 }
+          name: 'meta.declaration.c3'
         patterns:
           - include: "#type"
           - include: "#declaration_after_type"
@@ -708,18 +710,19 @@ repository:
         end: ;
         endCaptures:
           0: { name: punctuation.terminator.c3 }
+        name: 'meta.declaration.c3'
         patterns:
           - include: "#type"
           - include: "#declaration_after_type"
 
   declaration_after_type:
     patterns:
       - include: "#comments"
-      - include: "#generic_params"
+      #- include: "#generic_params"
       - match: '(?<!#)\$?\b{{IDENT}}\b'
         name: variable.other.c3
       - match: '\b{{CONST}}\b'
-        name: variable.other.constant
+        name: variable.other.constant.c3
       - include: "#attribute"
       - begin: \=
         beginCaptures:
@@ -801,8 +804,8 @@ repository:
       - include: "#control_statements"
 
       - include: "#declaration"
-      - include: "#expression"
       - include: "#block"
+      - include: "#expression"
 
   variable:
     match: '(?<!#)\$?\b{{IDENT}}\b'
@@ -829,19 +832,19 @@ repository:
 
       - include: "#parens"
       - include: "#brackets"
-      - include: "#expression_block"
       - include: "#initializer_list"
 
       - include: "#punctuation"
 
   function_call:
-    begin: '([@#]?{{IDENT}})(?=\s*\((?!<))'
+    begin: '([@#]?{{IDENT}}\b)(?=\s*(\{.*\})?\s*\()'
     beginCaptures:
       1: { name: entity.name.function.c3 }
     end: '\)'
     endCaptures:
       0: { name: meta.group.c3 punctuation.section.group.end.c3 }
     patterns:
+      - include: "#generic_params"
       # Argument list
       - begin: \(
         beginCaptures:
@@ -851,21 +854,25 @@ repository:
         patterns:
           - include: "#comments"
           # Named argument
-          - match: '(?<=[(\s,])(\.)([$#]?{{IDENT}})'
+          - match: '([$#]?{{IDENT}})\s*(:(?!:))'
             captures:
-              1: { name: punctuation.separator.c3 }
-              2: { name: variable.parameter.c3 }
+              1: { name: variable.parameter.c3 }
+              2: { name: punctuation.separator.c3 }
+          - match: '(\${{TYPE}})\s*(:(?!:))' # TODO I forget if this is even valid
+            captures:
+              1: { name: variable.parameter.c3 }
+              2: { name: punctuation.separator.c3 }
           - include: "#expression"
           - include: "#punctuation"
           - match: ';'
             name: punctuation.separator.c3
 
   block:
     patterns:
-      - begin: \{(?!\|)
+      - begin: \{
         beginCaptures:
           0: { name: meta.block.c3 punctuation.section.block.begin.c3 }
-        end: (?<!\|)\}
+        end: \}
         endCaptures:
           0: { name: meta.block.c3 punctuation.section.block.end.c3 }
         contentName: meta.block.c3
@@ -956,6 +963,6 @@ repository:
         end: \}
         endCaptures:
           0: { name: meta.block.c3 punctuation.section.block.end.c3 }
-        contentName: meta.block.c3
+        contentName: meta.block.c3 meta.initializer_list.c3
         patterns:
           - include: "#expression"

Original file line number	Diff line number	Diff line change
`@@ -1346,6 +1346,7 @@`
`1346`	`1346`	`"name": "punctuation.terminator.c3"`
`1347`	`1347`	`}`
`1348`	`1348`	`},`
	`1349`	`+ "name": "meta.declaration.c3",`
`1349`	`1350`	`"patterns": [`
`1350`	`1351`	`{`
`1351`	`1352`	`"match": "\\$(?:_[A-Z][_A-Z0-9][a-z][_a-zA-Z0-9]*)",`
`@@ -1362,7 +1363,8 @@`
`1362`	`1363`	`"endCaptures": {`
`1363`	`1364`	`"0": {`
`1364`	`1365`	`"name": "punctuation.terminator.c3"`
`1365`		`- }`
	`1366`	`+ },`
	`1367`	`+ "name": "meta.declaration.c3"`
`1366`	`1368`	`},`
`1367`	`1369`	`"patterns": [`
`1368`	`1370`	`{`
`@@ -1384,6 +1386,7 @@`
`1384`	`1386`	`"name": "punctuation.terminator.c3"`
`1385`	`1387`	`}`
`1386`	`1388`	`},`
	`1389`	`+ "name": "meta.declaration.c3",`
`1387`	`1390`	`"patterns": [`
`1388`	`1391`	`{`
`1389`	`1392`	`"include": "#type"`
`@@ -1400,16 +1403,13 @@`
`1400`	`1403`	`{`
`1401`	`1404`	`"include": "#comments"`
`1402`	`1405`	`},`
`1403`		`- {`
`1404`		`- "include": "#generic_params"`
`1405`		`- },`
`1406`	`1406`	`{`
`1407`	`1407`	`"match": "(?<!#)\\$?\\b(?:_[a-z][_a-zA-Z0-9])\\b",`
`1408`		`- "name": "variable.other.c3"`
	`1408`	`+ "name": "variable.other.declaration.c3"`
`1409`	`1409`	`},`
`1410`	`1410`	`{`
`1411`	`1411`	`"match": "\\b(?:_[A-Z][_A-Z0-9])\\b",`
`1412`		`- "name": "variable.other.constant"`
	`1412`	`+ "name": "variable.other.constant.declaration.c3"`
`1413`	`1413`	`},`
`1414`	`1414`	`{`
`1415`	`1415`	`"include": "#attribute"`
`@@ -1579,10 +1579,10 @@`
`1579`	`1579`	`"include": "#declaration"`
`1580`	`1580`	`},`
`1581`	`1581`	`{`
`1582`		`- "include": "#expression"`
	`1582`	`+ "include": "#block"`
`1583`	`1583`	`},`
`1584`	`1584`	`{`
`1585`		`- "include": "#block"`
	`1585`	`+ "include": "#expression"`
`1586`	`1586`	`}`
`1587`	`1587`	`]`
`1588`	`1588`	`},`
`@@ -1634,9 +1634,6 @@`
`1634`	`1634`	`{`
`1635`	`1635`	`"include": "#brackets"`
`1636`	`1636`	`},`
`1637`		`- {`
`1638`		`- "include": "#expression_block"`
`1639`		`- },`
`1640`	`1637`	`{`
`1641`	`1638`	`"include": "#initializer_list"`
`1642`	`1639`	`},`
`@@ -1646,7 +1643,7 @@`
`1646`	`1643`	`]`
`1647`	`1644`	`},`
`1648`	`1645`	`"function_call": {`
`1649`		`- "begin": "([@#]?(?:_[a-z][_a-zA-Z0-9]))(?=\\s*\\((?!<))",`
	`1646`	`+ "begin": "([@#]?(?:_[a-z][_a-zA-Z0-9])\\b)(?=\\s(\\{.\\})?\\s*\\()",`
`1650`	`1647`	`"beginCaptures": {`
`1651`	`1648`	`"1": {`
`1652`	`1649`	`"name": "entity.name.function.c3"`
`@@ -1659,6 +1656,9 @@`
`1659`	`1656`	`}`
`1660`	`1657`	`},`
`1661`	`1658`	`"patterns": [`
	`1659`	`+ {`
	`1660`	`+ "include": "#generic_params"`
	`1661`	`+ },`
`1662`	`1662`	`{`
`1663`	`1663`	`"begin": "\\(",`
`1664`	`1664`	`"beginCaptures": {`
`@@ -1673,13 +1673,24 @@`
`1673`	`1673`	`"include": "#comments"`
`1674`	`1674`	`},`
`1675`	`1675`	`{`
`1676`		`- "match": "(?<=[(\\s,])(\\.)([$#]?(?:_[a-z][_a-zA-Z0-9]))",`
	`1676`	`+ "match": "([$#]?(?:_[a-z][_a-zA-Z0-9]))\\s*(:(?!:))",`
`1677`	`1677`	`"captures": {`
`1678`	`1678`	`"1": {`
`1679`		`- "name": "punctuation.separator.c3"`
	`1679`	`+ "name": "variable.parameter.c3"`
`1680`	`1680`	`},`
`1681`	`1681`	`"2": {`
	`1682`	`+ "name": "punctuation.separator.c3"`
	`1683`	`+ }`
	`1684`	`+ }`
	`1685`	`+ },`
	`1686`	`+ {`
	`1687`	`+ "match": "(\\$(?:_[A-Z][_A-Z0-9][a-z][_a-zA-Z0-9]))\\s(:(?!:))",`
	`1688`	`+ "captures": {`
	`1689`	`+ "1": {`
`1682`	`1690`	`"name": "variable.parameter.c3"`
	`1691`	`+ },`
	`1692`	`+ "2": {`
	`1693`	`+ "name": "punctuation.separator.c3"`
`1683`	`1694`	`}`
`1684`	`1695`	`}`
`1685`	`1696`	`},`
`@@ -1700,13 +1711,13 @@`
`1700`	`1711`	`"block": {`
`1701`	`1712`	`"patterns": [`
`1702`	`1713`	`{`
`1703`		`- "begin": "\\{(?!\\\|)",`
	`1714`	`+ "begin": "\\{",`
`1704`	`1715`	`"beginCaptures": {`
`1705`	`1716`	`"0": {`
`1706`	`1717`	`"name": "meta.block.c3 punctuation.section.block.begin.c3"`
`1707`	`1718`	`}`
`1708`	`1719`	`},`
`1709`		`- "end": "(?<!\\\|)\\}",`
	`1720`	`+ "end": "\\}",`
`1710`	`1721`	`"endCaptures": {`
`1711`	`1722`	`"0": {`
`1712`	`1723`	`"name": "meta.block.c3 punctuation.section.block.end.c3"`
`@@ -1893,7 +1904,7 @@`
`1893`	`1904`	`"name": "meta.block.c3 punctuation.section.block.end.c3"`
`1894`	`1905`	`}`
`1895`	`1906`	`},`
`1896`		`- "contentName": "meta.block.c3",`
	`1907`	`+ "contentName": "meta.block.c3 meta.initializer_list.c3",`
`1897`	`1908`	`"patterns": [`
`1898`	`1909`	`{`
`1899`	`1910`	`"include": "#expression"`