tm-grammars 1.26.0 → 1.27.1

package/grammars/csharp.json

@@ -313,7 +313,7 @@
       ]
     },
     "array-creation-expression": {
-      "begin": "\\b(new|stackalloc)\\b\\s*(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)?\\s*(?=\\[)",
+      "begin": "\\b(new|stackalloc)\\b\\s*(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\*\\s*)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)?\\s*(?=\\[)",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.expression.$1.cs"
@@ -441,7 +441,7 @@
       ]
     },
     "attribute-section": {
-      "begin": "(\\[)(assembly|module|field|event|method|param|property|return|type)?(:)?",
+      "begin": "(\\[)(assembly|module|field|event|method|param|property|return|typevar|type)?(:)?",
       "beginCaptures": {
         "1": {
           "name": "punctuation.squarebracket.open.cs"
@@ -495,6 +495,33 @@
         }
       ]
     },
+    "base-class-constructor-call": {
+      "begin": "(?:(@?[_[:alpha:]][_[:alnum:]]*)\\s*(\\.))*(@?[_[:alpha:]][_[:alnum:]]*)\\s*(<(?<type_args>[^()<>]|\\((?:[^()<>]|<[^()<>]*>|\\([^()<>]*\\))*\\)|<\\g<type_args>*>)*>\\s*)?(?=\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.type.cs"
+        },
+        "2": {
+          "name": "punctuation.accessor.cs"
+        },
+        "3": {
+          "name": "entity.name.type.cs"
+        },
+        "4": {
+          "patterns": [
+            {
+              "include": "#type-arguments"
+            }
+          ]
+        }
+      },
+      "end": "(?<=\\))",
+      "patterns": [
+        {
+          "include": "#argument-list"
+        }
+      ]
+    },
     "base-types": {
       "begin": ":",
       "beginCaptures": {
@@ -504,6 +531,9 @@
       },
       "end": "(?=\\{|where|;)",
       "patterns": [
+        {
+          "include": "#base-class-constructor-call"
+        },
         {
           "include": "#type"
         },
@@ -870,9 +900,15 @@
         {
           "include": "#type-declarations"
         },
+        {
+          "include": "#constructor-declaration"
+        },
         {
           "include": "#property-declaration"
         },
+        {
+          "include": "#fixed-size-buffer-declaration"
+        },
         {
           "include": "#field-declaration"
         },
@@ -885,9 +921,6 @@
         {
           "include": "#variable-initializer"
         },
-        {
-          "include": "#constructor-declaration"
-        },
         {
           "include": "#destructor-declaration"
         },
@@ -1042,17 +1075,14 @@
       ]
     },
     "constructor-declaration": {
-      "begin": "(?=@?[_[:alpha:]][_[:alnum:]]*\\s*\\()",
+      "begin": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(?=\\(|$)",
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.function.cs"
+        }
+      },
       "end": "(?<=})|(?=;)",
       "patterns": [
-        {
-          "captures": {
-            "1": {
-              "name": "entity.name.function.cs"
-            }
-          },
-          "match": "(@?[_[:alpha:]][_[:alnum:]]*)\\b"
-        },
         {
           "begin": "(:)",
           "beginCaptures": {
@@ -1696,6 +1726,12 @@
         {
           "include": "#is-expression"
         },
+        {
+          "include": "#boolean-literal"
+        },
+        {
+          "include": "#null-literal"
+        },
         {
           "include": "#anonymous-method-expression"
         },
@@ -1889,6 +1925,33 @@
         }
       ]
     },
+    "fixed-size-buffer-declaration": {
+      "begin": "\\b(fixed)\\b\\s+(?<type_name>(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)\\s+(\\g<identifier>)\\s*(?=\\[)",
+      "beginCaptures": {
+        "1": {
+          "name": "storage.modifier.fixed.cs"
+        },
+        "2": {
+          "patterns": [
+            {
+              "include": "#type"
+            }
+          ]
+        },
+        "6": {
+          "name": "entity.name.variable.field.cs"
+        }
+      },
+      "end": "(?=;)",
+      "patterns": [
+        {
+          "include": "#bracketed-argument-list"
+        },
+        {
+          "include": "#comment"
+        }
+      ]
+    },
     "fixed-statement": {
       "begin": "\\b(fixed)\\b",
       "beginCaptures": {
@@ -1957,6 +2020,15 @@
                 },
                 {
                   "include": "#local-variable-declaration"
+                },
+                {
+                  "include": "#local-tuple-var-deconstruction"
+                },
+                {
+                  "include": "#tuple-deconstruction-assignment"
+                },
+                {
+                  "include": "#expression"
                 }
               ]
             },
@@ -2726,6 +2798,9 @@
         },
         {
           "include": "#local-tuple-var-deconstruction"
+        },
+        {
+          "include": "#local-tuple-declaration-deconstruction"
         }
       ]
     },
@@ -2776,6 +2851,18 @@
         }
       ]
     },
+    "local-tuple-declaration-deconstruction": {
+      "captures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#tuple-declaration-deconstruction-element-list"
+            }
+          ]
+        }
+      },
+      "match": "(?<tuple>\\((?:[^()]|\\g<tuple>)+\\))\\s*(?!=[=>])(?==)"
+    },
     "local-tuple-var-deconstruction": {
       "begin": "\\b(var)\\b\\s*(?<tuple>\\((?:[^()]|\\g<tuple>)+\\))\\s*(?=[);=])",
       "beginCaptures": {
@@ -2801,7 +2888,7 @@
       ]
     },
     "local-variable-declaration": {
-      "begin": "(?:(?:\\b(ref)\\s+(?:\\b(readonly)\\s+)?)?\\b(var)\\b|(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*[*?]\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*))\\s+(\\g<identifier>)\\s*(?!=>)(?=[),;=])",
+      "begin": "(?:(?:\\b(ref)\\s+(?:\\b(readonly)\\s+)?)?\\b(var)\\b|(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\*\\s*)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*))\\s+(\\g<identifier>)\\s*(?!=>)(?=[),;=])",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.ref.cs"
@@ -3469,7 +3556,7 @@
       "name": "meta.preprocessor.cs",
       "patterns": [
         {
-          "include": "#comment"
+          "include": "#preprocessor-comment"
         },
         {
           "include": "#preprocessor-define-or-undef"
@@ -3632,6 +3719,29 @@
       },
       "match": "\\b(sdk)\\b\\s*([_[:alpha:]][._[:alnum:]]*)?(@)?(.*)?\\s*"
     },
+    "preprocessor-comment": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.comment.cs"
+            }
+          },
+          "match": "(//).*(?=$)",
+          "name": "comment.line.double-slash.cs"
+        },
+        {
+          "begin": "/\\*",
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.comment.cs"
+            }
+          },
+          "end": "\\*/",
+          "name": "comment.block.cs"
+        }
+      ]
+    },
     "preprocessor-define-or-undef": {
       "captures": {
         "1": {
@@ -3726,7 +3836,7 @@
       "end": "(?=$)",
       "patterns": [
         {
-          "include": "#comment"
+          "include": "#preprocessor-comment"
         },
         {
           "include": "#preprocessor-expression"
@@ -3911,10 +4021,13 @@
           "name": "storage.modifier.$1.cs"
         },
         {
-          "begin": "\\b(get)\\b\\s*(?=[;{]|=>|//|/\\*|$)",
+          "begin": "(?:\\b(readonly)\\s+)?\\b(get)\\b\\s*(?=[;{]|=>|//|/\\*|$)",
           "beginCaptures": {
             "1": {
-              "name": "storage.type.accessor.$1.cs"
+              "name": "storage.modifier.readonly.cs"
+            },
+            "2": {
+              "name": "storage.type.accessor.get.cs"
             }
           },
           "end": "(?<=[;}])|(?=})",

package/grammars/fortran-fixed-form.json

@@ -25,6 +25,43 @@
     {
       "include": "#comments"
     },
+    {
+      "begin": "(?i)^(?=.{5}|(?<!^)\\t)\\s*(?:([0-9]{1,5})\\s+)?(format)\\b",
+      "beginCaptures": {
+        "1": {
+          "name": "constant.numeric.fortran"
+        },
+        "2": {
+          "name": "keyword.control.format.fortran"
+        }
+      },
+      "end": "(?=^(?![^\\n!#]{5}\\S))",
+      "name": "meta.statement.IO.fortran",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#line-header"
+        },
+        {
+          "match": "!.*$",
+          "name": "comment.line.fortran"
+        },
+        {
+          "include": "source.fortran.free#string-constant"
+        },
+        {
+          "include": "source.fortran.free#numeric-constant"
+        },
+        {
+          "include": "source.fortran.free#operators"
+        },
+        {
+          "include": "source.fortran.free#format-parentheses"
+        }
+      ]
+    },
     {
       "include": "#line-header"
     },

package/grammars/fortran-free-form.json

@@ -198,13 +198,31 @@
     "IO-statements": {
       "patterns": [
         {
-          "begin": "(?i)\\b(?:(backspace)|(close)|(endfile)|(format)|(inquire)|(open)|(read)|(rewind)|(write))\\s*(?=\\()",
+          "begin": "(?i)\\b(format)(?=\\s*[!\\&(])",
           "beginCaptures": {
             "1": {
-              "name": "keyword.control.backspace.fortran"
+              "name": "keyword.control.format.fortran"
+            }
+          },
+          "end": "(?=[\\n!;])",
+          "name": "meta.statement.IO.fortran",
+          "patterns": [
+            {
+              "include": "#comments"
             },
-            "10": {
-              "name": "punctuation.parentheses.left.fortran"
+            {
+              "include": "#line-continuation-operator"
+            },
+            {
+              "include": "#format-parentheses"
+            }
+          ]
+        },
+        {
+          "begin": "(?i)\\b(?:(backspace)|(close)|(endfile)|(inquire)|(open)|(read)|(rewind)|(write))\\s*(?=\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.backspace.fortran"
             },
             "2": {
               "name": "keyword.control.close.fortran"
@@ -213,22 +231,22 @@
               "name": "keyword.control.endfile.fortran"
             },
             "4": {
-              "name": "keyword.control.format.fortran"
+              "name": "keyword.control.inquire.fortran"
             },
             "5": {
-              "name": "keyword.control.inquire.fortran"
+              "name": "keyword.control.open.fortran"
             },
             "6": {
-              "name": "keyword.control.open.fortran"
+              "name": "keyword.control.read.fortran"
             },
             "7": {
-              "name": "keyword.control.read.fortran"
+              "name": "keyword.control.rewind.fortran"
             },
             "8": {
-              "name": "keyword.control.rewind.fortran"
+              "name": "keyword.control.write.fortran"
             },
             "9": {
-              "name": "keyword.control.write.fortran"
+              "name": "punctuation.parentheses.left.fortran"
             }
           },
           "end": "(?=[\\n!;])",
@@ -398,7 +416,7 @@
       "match": "(-)|(\\+)|/(?![/=\\\\])|(\\*\\*)|(\\*)"
     },
     "array-constructor": {
-      "begin": "(?=\\s*(\\[|\\(/))",
+      "begin": "(?<!\\n)(?=\\s*(\\[|\\(/))",
       "end": "(?<!\\G)",
       "name": "meta.contructor.array",
       "patterns": [
@@ -699,6 +717,7 @@
     "call-statement": {
       "patterns": [
         {
+          "applyEndPatternLast": 1,
           "begin": "(?i)\\s*\\b(call)\\b",
           "beginCaptures": {
             "1": {
@@ -709,25 +728,34 @@
           "name": "meta.statement.control.call.fortran",
           "patterns": [
             {
-              "begin": "(?i)\\G\\s*([a-z]\\w*)(%)([a-z]\\w*)\\b\\s*(?=\\()",
-              "beginCaptures": {
-                "1": {
-                  "name": "variable.other.fortran"
+              "begin": "(?i)(?=\\s*[a-z]\\w*\\s*%)",
+              "end": "(?=[\\n!;])",
+              "patterns": [
+                {
+                  "include": "#comments"
                 },
-                "2": {
-                  "name": "keyword.accessor.fortran"
+                {
+                  "include": "#line-continuation-operator"
+                },
+                {
+                  "captures": {
+                    "1": {
+                      "name": "variable.other.fortran"
+                    },
+                    "2": {
+                      "name": "keyword.accessor.fortran"
+                    }
+                  },
+                  "match": "(?i)\\s*([a-z]\\w*)\\s*(%)"
+                },
+                {
+                  "captures": {
+                    "1": {
+                      "name": "entity.name.function.subroutine.fortran"
+                    }
+                  },
+                  "match": "(?i)\\s*([a-z]\\w*)"
                 },
-                "3": {
-                  "name": "entity.name.function.subroutine.fortran"
-                }
-              },
-              "end": "(?<!\\G)",
-              "endCaptures": {
-                "1": {
-                  "name": "punctuation.parentheses.right.fortran"
-                }
-              },
-              "patterns": [
                 {
                   "include": "#parentheses-dummy-variables"
                 }
@@ -2274,6 +2302,104 @@
         }
       ]
     },
+    "format-descriptor": {
+      "begin": "\\(/",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.bracket.left.fortran"
+        }
+      },
+      "contentName": "meta.format-descriptor.fortran",
+      "end": "\\)",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.bracket.right.fortran"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#constants"
+        },
+        {
+          "include": "#operators"
+        },
+        {
+          "include": "#parentheses"
+        },
+        {
+          "include": "#intrinsic-functions"
+        },
+        {
+          "include": "#variable"
+        }
+      ]
+    },
+    "format-descriptors": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "keyword.other.format-descriptor.fortran"
+            }
+          },
+          "match": "(?i)(?:\\b|(?<=\\d)|(?<=P))(EN|ES|EX|DT|DC|DP|RC|RD|RN|RP|RU|RZ|BN|BZ|SP|SS|TL|TR|[ABD-GILOPQSTXZ])(?=$|[^A-Z_a-z]|[D-G](?i))"
+        },
+        {
+          "match": "/",
+          "name": "keyword.operator.format.newline.fortran"
+        },
+        {
+          "match": ":",
+          "name": "keyword.operator.format.separator.fortran"
+        },
+        {
+          "match": "[$\\\\]",
+          "name": "keyword.other.format-descriptor.nonstandard.fortran"
+        },
+        {
+          "match": "(?i)(?:\\b|(?<=\\d))\\d+H",
+          "name": "keyword.other.format-descriptor.legacy.fortran"
+        }
+      ]
+    },
+    "format-parentheses": {
+      "begin": "\\s*(\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.parentheses.left.fortran"
+        }
+      },
+      "end": "(\\))",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parentheses.right.fortran"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#line-continuation-operator"
+        },
+        {
+          "match": "(?:\\b|[-+])\\d+(?=[A-Za-z])",
+          "name": "constant.numeric.fortran"
+        },
+        {
+          "include": "#format-descriptors"
+        },
+        {
+          "include": "#format-parentheses"
+        },
+        {
+          "include": "#parentheses-common"
+        }
+      ]
+    },
     "function-definition": {
       "begin": "(?i)(?=([^\\n!\"':;](?!\\bend)(?!\\bsubroutine\\b))*\\bfunction\\b)",
       "end": "(?=[\\n!;])",
@@ -2662,7 +2788,7 @@
                   "patterns": [
                     {
                       "begin": "(?!(\\s*([\\n!;])))",
-                      "end": "(?=[\\n!;])",
+                      "end": "\\s*(?=[\\n!;])",
                       "patterns": [
                         {
                           "captures": {
@@ -2673,7 +2799,7 @@
                               "name": "invalid.error.label.else.fortran"
                             }
                           },
-                          "match": "\\s*([a-z]\\w*)?\\s*\\b(\\w*)\\b"
+                          "match": "(?i)\\s*([a-z]\\w*)?\\s*\\b(\\w*)\\b"
                         },
                         {
                           "include": "#invalid-word"
@@ -3785,19 +3911,26 @@
       },
       "patterns": [
         {
-          "include": "#comments"
+          "include": "#array-constructor"
         },
         {
-          "include": "#constants"
+          "include": "#parentheses"
         },
         {
-          "include": "#operators"
+          "include": "#parentheses-common"
+        }
+      ]
+    },
+    "parentheses-common": {
+      "patterns": [
+        {
+          "include": "#comments"
         },
         {
-          "include": "#array-constructor"
+          "include": "#constants"
         },
         {
-          "include": "#parentheses"
+          "include": "#operators"
         },
         {
           "include": "#intrinsic-functions"
@@ -3824,15 +3957,6 @@
         {
           "include": "#procedure-call-dummy-variable"
         },
-        {
-          "include": "#comments"
-        },
-        {
-          "include": "#constants"
-        },
-        {
-          "include": "#operators"
-        },
         {
           "include": "#array-constructor"
         },
@@ -3840,10 +3964,7 @@
           "include": "#parentheses"
         },
         {
-          "include": "#intrinsic-functions"
-        },
-        {
-          "include": "#variable"
+          "include": "#parentheses-common"
         }
       ]
     },
@@ -5547,11 +5668,19 @@
                       "name": "keyword.control.elsewhere.fortran"
                     }
                   },
-                  "end": "(?=[\\n!;])",
+                  "end": "\\s*(?=[\\n!;])",
                   "patterns": [
                     {
                       "include": "#parentheses"
                     },
+                    {
+                      "captures": {
+                        "1": {
+                          "name": "meta.label.elsewhere.fortran"
+                        }
+                      },
+                      "match": "(?i)(\\s*[a-z]\\w*)?"
+                    },
                     {
                       "include": "#invalid-word"
                     }