tm-grammars 1.22.19 → 1.23.0

package/grammars/fortran-free-form.json

@@ -16,7 +16,7 @@
     ".pf",
     ".PF"
   ],
-  "firstLineMatch": "(?i)-[*]- mode: fortran free -[*]-",
+  "firstLineMatch": "(?i)-\\*- mode: fortran free -\\*-",
   "injections": {
     "source.fortran.free - ( string | comment | meta.preprocessor )": {
       "patterns": [
@@ -128,7 +128,7 @@
     "IO-item-list": {
       "begin": "(?i)(?=\\s*[a-z0-9\"'])",
       "contentName": "meta.name-list.fortran",
-      "end": "(?=[\\);!\\n])",
+      "end": "(?=[);!\\n])",
       "patterns": [
         {
           "include": "#constants"
@@ -198,7 +198,7 @@
     "IO-statements": {
       "patterns": [
         {
-          "begin": "(?ix)\\b(?:(backspace)|(close)|(endfile)|(format)|(inquire)|(open)|(read)|(rewind)|(write))\\s*(?=\\()",
+          "begin": "(?i)\\b(?:(backspace)|(close)|(endfile)|(format)|(inquire)|(open)|(read)|(rewind)|(write))\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.backspace.fortran"
@@ -395,10 +395,10 @@
           "name": "keyword.operator.multiplication.fortran"
         }
       },
-      "match": "(\\-)|(\\+)|\\/(?!\\/|\\=|\\\\)|(\\*\\*)|(\\*)"
+      "match": "(-)|(\\+)|/(?![/=\\\\])|(\\*\\*)|(\\*)"
     },
     "array-constructor": {
-      "begin": "(?=\\s*(\\[|\\(\\/))",
+      "begin": "(?=\\s*(\\[|\\(/))",
       "end": "(?<!\\G)",
       "name": "meta.contructor.array",
       "patterns": [
@@ -406,13 +406,13 @@
           "include": "#brackets"
         },
         {
-          "begin": "\\s*(\\(\\/)",
+          "begin": "\\s*(\\(/)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.bracket.left.fortran"
             }
           },
-          "end": "(\\/\\))",
+          "end": "(/\\))",
           "endCaptures": {
             "1": {
               "name": "punctuation.bracket.left.fortran"
@@ -497,7 +497,7 @@
       ]
     },
     "assignment-operator": {
-      "match": "(?<!\\/|\\=|\\<|\\>)(\\=)(?!\\=|\\>)",
+      "match": "(?<![/=<>])(=)(?![=>])",
       "name": "keyword.operator.assignment.fortran"
     },
     "associate-construct": {
@@ -529,7 +529,7 @@
       "match": "(?i)\\G\\s*\\b(asynchronous)\\b"
     },
     "attribute-specification-statement": {
-      "begin": "(?ix)(?=\\b(?:allocatable|asynchronous|contiguous |external|intrinsic|optional|parameter|pointer|private|protected|public|save|target|value|volatile)\\b |(bind|dimension|intent)\\s*\\( |(codimension)\\s*\\[)",
+      "begin": "(?i)(?=\\b(?:allocatable|asynchronous|contiguous|external|intrinsic|optional|parameter|pointer|private|protected|public|save|target|value|volatile)\\b|(bind|dimension|intent)\\s*\\(|(codimension)\\s*\\[)",
       "end": "(?=[;!\\n])",
       "name": "meta.statement.attribute-specification.fortran",
       "patterns": [
@@ -637,7 +637,7 @@
           "name": "entity.name.block-data.fortran"
         }
       },
-      "end": "(?ix)\\b(?:(end\\s*block\\s*data)(?:\\s+(\\2))?|(end))\\b (?:\\s*(\\S((?!\\n).)*))?",
+      "end": "(?i)\\b(?:(end\\s*block\\s*data)(?:\\s+(\\2))?|(end))\\b(?:\\s*(\\S((?!\\n).)*))?",
       "endCaptures": {
         "1": {
           "name": "keyword.control.end-block-data.fortran"
@@ -666,7 +666,7 @@
           "name": "punctuation.bracket.left.fortran"
         }
       },
-      "end": "(\\])",
+      "end": "(])",
       "endCaptures": {
         "1": {
           "name": "punctuation.bracket.left.fortran"
@@ -709,7 +709,7 @@
           "name": "meta.statement.control.call.fortran",
           "patterns": [
             {
-              "begin": "(?ix)\\G\\s*([a-z]\\w*)(%)([a-z]\\w*)\\b\\s*(?=\\()",
+              "begin": "(?i)\\G\\s*([a-z]\\w*)(%)([a-z]\\w*)\\b\\s*(?=\\()",
               "beginCaptures": {
                 "1": {
                   "name": "variable.other.fortran"
@@ -978,7 +978,7 @@
                       "name": "constant.numeric.exponent.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -993,7 +993,7 @@
                       "name": "constant.numeric.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1008,7 +1008,7 @@
                       "name": "constant.numeric.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1026,7 +1026,7 @@
                       "name": "keyword.operator.minus.exponent.hexadecimal.cpp"
                     }
                   },
-                  "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?<!')([pP])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?([lLfF](?!\\w))?((?:\\w(?<![0-9a-fA-FpP])\\w*)?$)"
+                  "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?((?:(?<=\\h)\\.|\\.(?=\\h)))(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?(?:(?<!')([pP])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?([lLfF](?!\\w))?((?:\\w(?<![pP\\h])\\w*)?$)"
                 },
                 {
                   "captures": {
@@ -1034,7 +1034,7 @@
                       "name": "constant.numeric.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1055,7 +1055,7 @@
                       "name": "constant.numeric.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1076,13 +1076,13 @@
                       "name": "constant.numeric.exponent.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
                     }
                   },
-                  "match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?<!')([eE])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?([lLfF](?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)"
+                  "match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?(?:(?<!')([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?([lLfF](?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)"
                 },
                 {
                   "captures": {
@@ -1093,7 +1093,7 @@
                       "name": "constant.numeric.binary.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1108,7 +1108,7 @@
                       "name": "keyword.other.unit.user-defined.cpp"
                     }
                   },
-                  "match": "(\\G0[bB])([01](?:[01]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9])\\w*)?$)"
+                  "match": "(\\G0[bB])([01](?:[01]|((?<=\\h)'(?=\\h)))*)((?:[uU]|[uU]ll?|[uU]LL?|ll?[uU]?|LL?[uU]?|[fF])(?!\\w))?((?:\\w(?<![0-9])\\w*)?$)"
                 },
                 {
                   "captures": {
@@ -1119,7 +1119,7 @@
                       "name": "constant.numeric.octal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1134,7 +1134,7 @@
                       "name": "keyword.other.unit.user-defined.cpp"
                     }
                   },
-                  "match": "(\\G0)((?:[0-7]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))+)((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9])\\w*)?$)"
+                  "match": "(\\G0)((?:[0-7]|((?<=\\h)'(?=\\h)))+)((?:[uU]|[uU]ll?|[uU]LL?|ll?[uU]?|LL?[uU]?|[fF])(?!\\w))?((?:\\w(?<![0-9])\\w*)?$)"
                 },
                 {
                   "captures": {
@@ -1145,7 +1145,7 @@
                       "name": "constant.numeric.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1166,7 +1166,7 @@
                       "name": "constant.numeric.exponent.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1178,7 +1178,7 @@
                       "name": "keyword.other.unit.user-defined.cpp"
                     }
                   },
-                  "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)(?:(?<!')([pP])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9a-fA-FpP])\\w*)?$)"
+                  "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)(?:(?<!')([pP])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?((?:[uU]|[uU]ll?|[uU]LL?|ll?[uU]?|LL?[uU]?|[fF])(?!\\w))?((?:\\w(?<![pP\\h])\\w*)?$)"
                 },
                 {
                   "captures": {
@@ -1186,7 +1186,7 @@
                       "name": "constant.numeric.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1207,7 +1207,7 @@
                       "name": "constant.numeric.exponent.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1219,10 +1219,10 @@
                       "name": "keyword.other.unit.user-defined.cpp"
                     }
                   },
-                  "match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)(?:(?<!')([eE])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)"
+                  "match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)(?:(?<!')([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?((?:[uU]|[uU]ll?|[uU]LL?|ll?[uU]?|LL?[uU]?|[fF])(?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)"
                 },
                 {
-                  "match": "(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])+",
+                  "match": "(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+\\-])+",
                   "name": "invalid.illegal.constant.numeric.cpp"
                 }
               ]
@@ -1230,7 +1230,7 @@
           ]
         }
       },
-      "match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])*"
+      "match": "(?<!\\w)\\.?\\d(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+\\-])*"
     },
     "critical-construct": {
       "begin": "(?i)\\b(critical)\\b",
@@ -1377,10 +1377,10 @@
           "name": "entity.name.derived-type.parameter.fortran"
         }
       },
-      "match": "(?ix)\\b(integer)\\s*(,)\\s*(kind|len)\\s*(?:(::)\\s*([a-z]\\w*)?)?\\s*(?=[;!\\n])"
+      "match": "(?i)\\b(integer)\\s*(,)\\s*(kind|len)\\s*(?:(::)\\s*([a-z]\\w*)?)?\\s*(?=[;!\\n])"
     },
     "derived-type-component-procedure-specification": {
-      "begin": "(?i)(?=\\b(?:procedure)\\b)",
+      "begin": "(?i)(?=\\bprocedure\\b)",
       "end": "(?=[;!\\n])",
       "name": "meta.specification.procedure.fortran",
       "patterns": [
@@ -1431,7 +1431,7 @@
       ]
     },
     "derived-type-component-type-specification": {
-      "begin": "(?ix)(?=\\b(?:character|class|complex|double\\s*precision|double\\s*complex|integer|logical|real|type)\\b(?![^:'\";!\\n]*\\bfunction\\b))",
+      "begin": "(?i)(?=\\b(?:character|class|complex|double\\s*precision|double\\s*complex|integer|logical|real|type)\\b(?![^:'\";!\\n]*\\bfunction\\b))",
       "end": "(?=[;!\\n])",
       "name": "meta.specification.derived-type.fortran",
       "patterns": [
@@ -1491,7 +1491,7 @@
       ]
     },
     "derived-type-contains-attribute-specification": {
-      "begin": "(?i)(?=\\b(?:private)\\b)",
+      "begin": "(?i)(?=\\bprivate\\b)",
       "end": "(?=[;!\\n])",
       "name": "meta.statement.attribute-specification.fortran",
       "patterns": [
@@ -1560,7 +1560,7 @@
                   "name": "punctuation.comma.fortran"
                 }
               },
-              "end": "(?=::|[,&;!\\n])",
+              "end": "(?=::|[,\\&;!\\n])",
               "patterns": [
                 {
                   "include": "#access-attribute"
@@ -1597,7 +1597,7 @@
       ]
     },
     "derived-type-contains-procedure-specification": {
-      "begin": "(?i)(?=\\b(?:procedure)\\b)",
+      "begin": "(?i)(?=\\bprocedure\\b)",
       "end": "(?=[;!\\n])",
       "name": "meta.specification.procedure.fortran",
       "patterns": [
@@ -1621,7 +1621,7 @@
                   "name": "punctuation.comma.fortran"
                 }
               },
-              "end": "(?=::|[,&;!\\n])",
+              "end": "(?=::|[,\\&;!\\n])",
               "name": "meta.something.fortran",
               "patterns": [
                 {
@@ -1652,7 +1652,7 @@
       ]
     },
     "derived-type-definition": {
-      "begin": "(?i)\\b(type)\\b(?!\\s*(\\(|is\\b|\\=))",
+      "begin": "(?i)\\b(type)\\b(?!\\s*(\\(|is\\b|=))",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.type.fortran"
@@ -1784,7 +1784,7 @@
           "name": "keyword.other.selector.fortran"
         }
       },
-      "match": "\\s*(\\%)"
+      "match": "\\s*(%)"
     },
     "dimension-attribute": {
       "begin": "(?i)\\s*\\b(dimension)(?=\\s*\\()",
@@ -1906,7 +1906,7 @@
           "name": "variable.parameter.fortran"
         }
       },
-      "match": "(?i)(?:^|(?<=[&,\\(]))\\s*([a-z]\\w*)"
+      "match": "(?i)(?:^|(?<=[\\&,(]))\\s*([a-z]\\w*)"
     },
     "dummy-variable-list": {
       "begin": "\\G\\s*(\\()",
@@ -2013,7 +2013,7 @@
               "include": "#comments"
             },
             {
-              "begin": "(?ix)\\b(enumerator)\\b",
+              "begin": "(?i)\\b(enumerator)\\b",
               "beginCaptures": {
                 "1": {
                   "name": "keyword.other.enumerator.fortran"
@@ -2099,7 +2099,7 @@
       ]
     },
     "event-statement": {
-      "begin": "(?i)\\b(event post|event wait)\\s*(?=\\()",
+      "begin": "(?i)\\b(event (?:post|wait))\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.event.fortran"
@@ -2320,7 +2320,7 @@
                   "name": "entity.name.function.fortran"
                 }
               },
-              "end": "(?ix)\\s*\\b(?:(end\\s*function)(?:\\s+([a-z_]\\w*))?|(end))\\b \\s*([^;!\\n]+)?(?=[;!\\n])",
+              "end": "(?i)\\s*\\b(?:(end\\s*function)(?:\\s+([a-z_]\\w*))?|(end))\\b\\s*([^;!\\n]+)?(?=[;!\\n])",
               "endCaptures": {
                 "1": {
                   "name": "keyword.other.endfunction.fortran"
@@ -2353,8 +2353,8 @@
                   ]
                 },
                 {
-                  "begin": "(?i)(?!\\b(?:end\\s*[;!\\n]|end\\s*function\\b))",
-                  "end": "(?i)(?=\\b(?:end\\s*[;!\\n]|end\\s*function\\b))",
+                  "begin": "(?i)(?!\\bend(?:\\s*[;!\\n]|\\s*function\\b))",
+                  "end": "(?i)(?=\\bend(?:\\s*[;!\\n]|\\s*function\\b))",
                   "name": "meta.block.specification.function.fortran",
                   "patterns": [
                     {
@@ -2364,7 +2364,7 @@
                           "name": "keyword.control.contains.fortran"
                         }
                       },
-                      "end": "(?i)(?=(?:end\\s*[;!\\n]|end\\s*function\\b))",
+                      "end": "(?i)(?=end(?:\\s*[;!\\n]|\\s*function\\b))",
                       "name": "meta.block.contains.fortran",
                       "patterns": [
                         {
@@ -2394,7 +2394,7 @@
       "name": "meta.interface.generic.fortran",
       "patterns": [
         {
-          "begin": "(?ix)\\G\\s*\\b(assignment)\\s* (\\()\\s*(?:(\\=)|(\\S.*))\\s*(\\))",
+          "begin": "(?i)\\G\\s*\\b(assignment)\\s*(\\()\\s*(?:(=)|(\\S.*))\\s*(\\))",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.assignment.fortran"
@@ -2412,7 +2412,7 @@
               "name": "punctuation.parentheses.right.fortran"
             }
           },
-          "end": "(?ix)\\b(end\\s*interface)\\b (?:\\s*\\b(\\1)\\b\\s*(\\()\\s*(?:(\\3)|(\\S.*))\\s*(\\)))?",
+          "end": "(?i)\\b(end\\s*interface)\\b(?:\\s*\\b(\\1)\\b\\s*(\\()\\s*(?:(\\3)|(\\S.*))\\s*(\\)))?",
           "endCaptures": {
             "1": {
               "name": "keyword.control.endinterface.fortran"
@@ -2443,7 +2443,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\G\\s*\\b(operator)\\s* (\\()\\s*(?: (\\.[a-z]+\\.|\\=\\=|\\/\\=|\\>\\=|\\>|\\<|\\<\\=|\\-|\\+|\\/|\\/\\/|\\*\\*|\\*) |(\\S.*) )\\s*(\\))",
+          "begin": "(?i)\\G\\s*\\b(operator)\\s*(\\()\\s*(?:(\\.[a-z]+\\.|==|/=|>=|[><]|<=|[\\-+/]|//|\\*\\*|\\*)|(\\S.*))\\s*(\\))",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.operator.fortran"
@@ -2461,7 +2461,7 @@
               "name": "punctuation.parentheses.right.fortran"
             }
           },
-          "end": "(?ix)\\b(end\\s*interface)\\b (?:\\s*\\b(\\1)\\b\\s*(\\()\\s*(?:(\\3)|(\\S.*))\\s*(\\)))?",
+          "end": "(?i)\\b(end\\s*interface)\\b(?:\\s*\\b(\\1)\\b\\s*(\\()\\s*(?:(\\3)|(\\S.*))\\s*(\\)))?",
           "endCaptures": {
             "1": {
               "name": "keyword.control.endinterface.fortran"
@@ -2492,7 +2492,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\G\\s*\\b(?:(read)|(write))\\s* (\\()\\s*(?:(formatted)|(unformatted)|(\\S.*))\\s*(\\))",
+          "begin": "(?i)\\G\\s*\\b(?:(read)|(write))\\s*(\\()\\s*(?:(formatted)|(unformatted)|(\\S.*))\\s*(\\))",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.read.fortran"
@@ -2516,7 +2516,7 @@
               "name": "punctuation.parentheses.right.fortran"
             }
           },
-          "end": "(?ix)\\b(end\\s*interface)\\b(?:\\s*\\b(?:(\\2)|(\\3))\\b\\s* (\\()\\s*(?:(\\4)|(\\5)|(\\S.*))\\s*(\\)))?",
+          "end": "(?i)\\b(end\\s*interface)\\b(?:\\s*\\b(?:(\\2)|(\\3))\\b\\s*(\\()\\s*(?:(\\4)|(\\5)|(\\S.*))\\s*(\\)))?",
           "endCaptures": {
             "1": {
               "name": "keyword.control.endinterface.fortran"
@@ -2661,7 +2661,7 @@
                   "end": "(?i)(?=\\b(end\\s*if)\\b)",
                   "patterns": [
                     {
-                      "begin": "(?!(\\s*(;|!|\\n)))",
+                      "begin": "(?!(\\s*([;!\\n])))",
                       "end": "(?=[;!\\n])",
                       "patterns": [
                         {
@@ -2945,7 +2945,7 @@
     "intrinsic-functions": {
       "patterns": [
         {
-          "begin": "(?ix)\\b(acosh|asinh|atanh|bge|bgt|ble|blt|dshiftl|dshiftr| findloc|hypot|iall|iany|image_index|iparity|is_contiguous|lcobound| leadz|mask[lr]|merge_bits|norm2|num_images|parity|popcnt|poppar| shift[alr]|storage_size|this_image|trailz|ucobound)\\s*(?=\\()",
+          "begin": "(?i)\\b(acosh|asinh|atanh|bge|bgt|ble|blt|dshiftl|dshiftr|findloc|hypot|iall|iany|image_index|iparity|is_contiguous|lcobound|leadz|mask[lr]|merge_bits|norm2|num_images|parity|popcnt|poppar|shift[alr]|storage_size|this_image|trailz|ucobound)\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -2967,7 +2967,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\b(bessel_[jy][01n]|erf(c(_scaled)?)?|gamma|log_gamma)\\s*(?=\\()",
+          "begin": "(?i)\\b(bessel_[jy][01n]|erf(c(_scaled)?)?|gamma|log_gamma)\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -2989,7 +2989,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\b(command_argument_count|extends_type_of|is_iostat_end| is_iostat_eor|new_line|same_type_as|selected_char_kind)\\s*(?=\\()",
+          "begin": "(?i)\\b(command_argument_count|extends_type_of|is_iostat_end|is_iostat_eor|new_line|same_type_as|selected_char_kind)\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -3011,7 +3011,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\b(ieee_( class|copy_sign|is_(finite|nan|negative|normal)|logb|next_after|rem| rint|scalb|selected_real_kind| support_(datatype|denormal|divide|inf|io|nan|rounding|sqrt|standard|underflow_control)| unordered|value))\\s*(?=\\()",
+          "begin": "(?i)\\b(ieee_(class|copy_sign|is_(finite|nan|negative|normal)|logb|next_after|rem|rint|scalb|selected_real_kind|support_(datatype|denormal|divide|inf|io|nan|rounding|sqrt|standard|underflow_control)|unordered|value))\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -3033,7 +3033,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\b(ieee_support_(flag|halting))\\s*(?=\\()",
+          "begin": "(?i)\\b(ieee_support_(flag|halting))\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -3055,7 +3055,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\b(c_(associated|funloc|loc|sizeof))\\s*(?=\\()",
+          "begin": "(?i)\\b(c_(associated|funloc|loc|sizeof))\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -3074,7 +3074,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\b(compiler_(options|version))\\s*(?=\\()",
+          "begin": "(?i)\\b(compiler_(options|version))\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -3096,7 +3096,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\b(null)\\s*(?=\\()",
+          "begin": "(?i)\\b(null)\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -3118,7 +3118,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\b(achar|adjustl|adjustr|all|allocated|associated|any|bit_size|btest|ceiling|count|cshift|digits|dot_product|eoshift|epsilon|exponent|floor|fraction|huge|iachar|iand|ibclr|ibits|ibset|ieor|ior|ishftc?| kind|lbound|len_trim|logical|matmul|maxexponent|maxloc|maxval|merge|minexponent|minloc|minval|modulo|nearest|not|pack|precision|present|product|radix|range|repeat|reshape|rrspacing|scale|scan|selected_(int|real)_kind|set_exponent|shape|size|spacing|spread|sum|tiny|transfer|transpose|trim|ubound|unpack|verify)\\s*(?=\\()",
+          "begin": "(?i)\\b(achar|adjustl|adjustr|all|allocated|associated|any|bit_size|btest|ceiling|count|cshift|digits|dot_product|eoshift|epsilon|exponent|floor|fraction|huge|iachar|iand|ibclr|ibits|ibset|ieor|ior|ishftc?|kind|lbound|len_trim|logical|matmul|maxexponent|maxloc|maxval|merge|minexponent|minloc|minval|modulo|nearest|not|pack|precision|present|product|radix|range|repeat|reshape|rrspacing|scale|scan|selected_(int|real)_kind|set_exponent|shape|size|spacing|spread|sum|tiny|transfer|transpose|trim|ubound|unpack|verify)\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -3140,7 +3140,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\b([icd]?abs|acos|[ad]int|[ad]nint|aimag|amax[01]| amin[01]|d?asin|d?atan|d?atan2|char|conjg|[cd]?cos|d?cosh|cmplx|dble| i?dim|dmax1|dmin1|dprod|[cd]?exp|float|ichar|idint|ifix|index|int|len| lge|lgt|lle|llt|[acd]?log|[ad]?log10|max[01]?|min[01]?|[ad]?mod| (id)?nint|real|[di]?sign|[cd]?sin|d?sinh|sngl|[cd]?sqrt|d?tan|d?tanh) \\s*(?=\\()",
+          "begin": "(?i)\\b([icd]?abs|acos|[ad]int|[ad]nint|aimag|amax[01]|amin[01]|d?asin|d?atan|d?atan2|char|conjg|[cd]?cos|d?cosh|cmplx|dble|i?dim|dmax1|dmin1|dprod|[cd]?exp|float|ichar|idint|ifix|index|int|len|lge|lgt|lle|llt|[acd]?log|[ad]?log10|max[01]?|min[01]?|[ad]?mod|(id)?nint|real|[di]?sign|[cd]?sin|d?sinh|sngl|[cd]?sqrt|d?tan|d?tanh)\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -3166,7 +3166,7 @@
     "intrinsic-subroutines": {
       "patterns": [
         {
-          "begin": "(?ix)\\G\\s*\\b(date_and_time|mvbits|random_number|random_seed| system_clock)\\s*(?=\\()",
+          "begin": "(?i)\\G\\s*\\b(date_and_time|mvbits|random_number|random_seed|system_clock)\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.subroutine.fortran"
@@ -3254,7 +3254,7 @@
           ]
         },
         {
-          "begin": "(?i)\\G\\s*\\b(c_f_(pointer|procpointer))\\s*(?=\\()",
+          "begin": "(?i)\\G\\s*\\b(c_f_(p(?:ointer|rocpointer)))\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.subroutine.fortran"
@@ -3276,7 +3276,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\G\\s*\\b(execute_command_line|get_command| get_command_argument|get_environment_variable|move_alloc)\\s*(?=\\()",
+          "begin": "(?i)\\G\\s*\\b(execute_command_line|get_command|get_command_argument|get_environment_variable|move_alloc)\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.subroutine.fortran"
@@ -3388,11 +3388,11 @@
     "logical-operators": {
       "patterns": [
         {
-          "match": "(?ix)(\\s*\\.(and|eq|eqv|le|lt|ge|gt|ne|neqv|not|or)\\.)",
+          "match": "(?i)(\\s*\\.(and|eq|eqv|le|lt|ge|gt|ne|neqv|not|or)\\.)",
           "name": "keyword.logical.fortran"
         },
         {
-          "match": "(\\=\\=|\\/\\=|\\>\\=|(?<!\\=)\\>|\\<\\=|\\<)",
+          "match": "(==|/=|>=|(?<!=)>|<=|<)",
           "name": "keyword.logical.fortran.modern"
         }
       ]
@@ -3444,10 +3444,10 @@
           "name": "storage.modifier.module.fortran"
         }
       },
-      "match": "(?ix)\\s*\\b(module)\\b(?=\\s*(?:[;!\\n]| [^'\";!\\n]*\\b(?:function|procedure|subroutine)\\b))"
+      "match": "(?i)\\s*\\b(module)\\b(?=\\s*(?:[;!\\n]|[^'\";!\\n]*\\b(?:function|procedure|subroutine)\\b))"
     },
     "module-definition": {
-      "begin": "(?ix)(?=\\b(module)\\b)(?![^'\";!\\n]* \\b(?:function|procedure|subroutine)\\b)",
+      "begin": "(?i)(?=\\b(module)\\b)(?![^'\";!\\n]*\\b(?:function|procedure|subroutine)\\b)",
       "end": "(?=[;!\\n])",
       "name": "meta.module.fortran",
       "patterns": [
@@ -3467,7 +3467,7 @@
               "name": "entity.name.class.module.fortran"
             }
           },
-          "end": "(?ix)\\b(?:(end\\s*module)(?:\\s+([a-z_]\\w*))?|(end))\\b \\s*([^;!\\n]+)?(?=[;!\\n])",
+          "end": "(?i)\\b(?:(end\\s*module)(?:\\s+([a-z_]\\w*))?|(end))\\b\\s*([^;!\\n]+)?(?=[;!\\n])",
           "endCaptures": {
             "1": {
               "name": "keyword.other.endmodule.fortran"
@@ -3485,7 +3485,7 @@
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(?i)(?=\\b(?:end\\s*[;!\\n]|end\\s*module\\b))",
+              "end": "(?i)(?=\\bend(?:\\s*[;!\\n]|\\s*module\\b))",
               "name": "meta.block.specification.module.fortran",
               "patterns": [
                 {
@@ -3495,7 +3495,7 @@
                       "name": "keyword.control.contains.fortran"
                     }
                   },
-                  "end": "(?i)(?=\\s*(?:end\\s*[;!\\n]|end\\s*module\\b))",
+                  "end": "(?i)(?=\\s*end(?:\\s*[;!\\n]|\\s*module\\b))",
                   "name": "meta.block.contains.fortran",
                   "patterns": [
                     {
@@ -3515,7 +3515,7 @@
     "name-list": {
       "begin": "(?i)(?=\\s*[a-z])",
       "contentName": "meta.name-list.fortran",
-      "end": "(?=[\\);!\\n])",
+      "end": "(?=[);!\\n])",
       "patterns": [
         {
           "include": "#constants"
@@ -3548,7 +3548,7 @@
     },
     "named-control-constructs": {
       "applyEndPatternLast": 1,
-      "begin": "(?ix)([a-z]\\w*)\\s*(:)(?=\\s*(?:associate|block(?!\\s*data)|critical|do|forall|if|select\\s*case|select\\s*type|select\\s*rank|where)\\b)",
+      "begin": "(?i)([a-z]\\w*)\\s*(:)(?=\\s*(?:associate|block(?!\\s*data)|critical|do|forall|if|select\\s*case|select\\s*type|select\\s*rank|where)\\b)",
       "contentName": "meta.named-construct.fortran.modern",
       "end": "(?i)(?!\\s*\\b(?:associate|block(?!\\s*data)|critical|do|forall|if|select\\s*case|select\\s*type|select\\s*rank|where)\\b)(?:\\b(\\1)\\b)?([^\\s;!\\n]*?)?(?=\\s*[;!\\n])",
       "endCaptures": {
@@ -3627,7 +3627,7 @@
       ]
     },
     "numeric-constant": {
-      "match": "(?ix)[\\+\\-]?(\\b\\d+\\.?\\d*|\\.\\d+) (_\\w+|d[\\+\\-]?\\d+|e[\\+\\-]?\\d+(_\\w+)?)?(?![a-z_])",
+      "match": "(?i)[+\\-]?(\\b\\d+\\.?\\d*|\\.\\d+)(_\\w+|d[+\\-]?\\d+|e[+\\-]?\\d+(_\\w+)?)?(?![a-z_])",
       "name": "constant.numeric.fortran"
     },
     "numeric-type": {
@@ -3694,7 +3694,7 @@
               "name": "constant.numeric.fortran"
             }
           },
-          "match": "(?ix)\\b(?:(complex)|(double\\s*precision)|(double\\s*complex)|(integer)|(real)|(dimension))\\b(?:\\s*(\\*)\\s*(\\d*))?"
+          "match": "(?i)\\b(?:(complex)|(double\\s*precision)|(double\\s*complex)|(integer)|(real)|(dimension))\\b(?:\\s*(\\*)\\s*(\\d*))?"
         }
       ]
     },
@@ -3897,7 +3897,7 @@
       "match": "(?i)\\s*\\b(pointer)\\b"
     },
     "pointer-operators": {
-      "match": "(\\=\\>)",
+      "match": "(=>)",
       "name": "keyword.other.point.fortran"
     },
     "preprocessor": {
@@ -3933,10 +3933,10 @@
           "name": "keyword.operator.multiplication.fortran"
         }
       },
-      "match": "(\\-)|(\\+)|(\\/)|(\\*)"
+      "match": "(-)|(\\+)|(/)|(\\*)"
     },
     "preprocessor-assignment-operator": {
-      "match": "(?<!\\=)(\\=)(?!\\=)",
+      "match": "(?<!=)(=)(?!=)",
       "name": "keyword.operator.assignment.preprocessor.fortran"
     },
     "preprocessor-comments": {
@@ -4237,7 +4237,7 @@
           "name": "keyword.operator.logical.preprocessor.complementary.fortran"
         }
       },
-      "match": "(&&)|(==)|(\\!=)|(\\|\\|)|(\\<\\=)|(\\>=)|(\\<)|(\\>)|(~)|(\\^)|(&)|(\\!)|(\\|)",
+      "match": "(&&)|(==)|(!=)|(\\|\\|)|(<=)|(>=)|(<)|(>)|(~)|(\\^)|(&)|(!)|(\\|)",
       "name": "keyword.operator.logical.preprocessor.fortran"
     },
     "preprocessor-operators": {
@@ -4351,7 +4351,7 @@
       "match": "(?i)\\s*\\b(private)\\b"
     },
     "procedure-call-dummy-variable": {
-      "match": "(?i)\\s*([a-z]\\w*)(?=\\s*\\=)(?!\\s*\\=\\=)",
+      "match": "(?i)\\s*([a-z]\\w*)(?=\\s*=)(?!\\s*==)",
       "name": "variable.parameter.dummy-variable.fortran.modern"
     },
     "procedure-definition": {
@@ -4375,7 +4375,7 @@
                   "name": "entity.name.function.procedure.fortran"
                 }
               },
-              "end": "(?ix)\\s*\\b(?:(end\\s*procedure)(?:\\s+([a-z_]\\w*))?|(end))\\b \\s*([^;!\\n]+)?(?=[;!\\n])",
+              "end": "(?i)\\s*\\b(?:(end\\s*procedure)(?:\\s+([a-z_]\\w*))?|(end))\\b\\s*([^;!\\n]+)?(?=[;!\\n])",
               "endCaptures": {
                 "1": {
                   "name": "keyword.other.endprocedure.fortran"
@@ -4418,7 +4418,7 @@
                       "name": "keyword.control.contains.fortran"
                     }
                   },
-                  "end": "(?i)(?=\\s*(?:end\\s*[;!\\n]|end\\s*procedure\\b))",
+                  "end": "(?i)(?=\\s*end(?:\\s*[;!\\n]|\\s*procedure\\b))",
                   "name": "meta.block.contains.fortran",
                   "patterns": [
                     {
@@ -4465,7 +4465,7 @@
       ]
     },
     "procedure-specification-statement": {
-      "begin": "(?i)(?=\\b(?:procedure)\\b)",
+      "begin": "(?i)(?=\\bprocedure\\b)",
       "end": "(?=[;!\\n])",
       "name": "meta.specification.procedure.fortran",
       "patterns": [
@@ -4489,7 +4489,7 @@
                   "name": "punctuation.comma.fortran"
                 }
               },
-              "end": "(?=::|[,&;!\\n])",
+              "end": "(?=::|[,\\&;!\\n])",
               "patterns": [
                 {
                   "include": "#access-attribute"
@@ -4580,7 +4580,7 @@
               "name": "entity.name.program.fortran"
             }
           },
-          "end": "(?ix)\\b(?:(end\\s*program)(?:\\s+([a-z_]\\w*))?|(end))\\b\\s*([^;!\\n]+)?(?=[;!\\n])",
+          "end": "(?i)\\b(?:(end\\s*program)(?:\\s+([a-z_]\\w*))?|(end))\\b\\s*([^;!\\n]+)?(?=[;!\\n])",
           "endCaptures": {
             "1": {
               "name": "keyword.control.endprogram.fortran"
@@ -4598,7 +4598,7 @@
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(?i)(?=\\b(?:end\\s*[;!\\n]|end\\s*program\\b))",
+              "end": "(?i)(?=\\bend(?:\\s*[;!\\n]|\\s*program\\b))",
               "name": "meta.block.specification.program.fortran",
               "patterns": [
                 {
@@ -4608,7 +4608,7 @@
                       "name": "keyword.control.contains.fortran"
                     }
                   },
-                  "end": "(?i)(?=(?:end\\s*[;!\\n]|end\\s*program\\b))",
+                  "end": "(?i)(?=end(?:\\s*[;!\\n]|\\s*program\\b))",
                   "name": "meta.block.contains.fortran",
                   "patterns": [
                     {
@@ -4975,7 +4975,7 @@
           "name": "keyword.operator.line-continuation.fortran"
         }
       },
-      "end": "(?i)^(?:(?=\\s*[^\\s!&])|\\s*(&))",
+      "end": "(?i)^(?:(?=\\s*[^\\s!\\&])|\\s*(&))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.line-continuation.fortran"
@@ -4992,7 +4992,7 @@
       ]
     },
     "string-operators": {
-      "match": "(\\/\\/)",
+      "match": "(//)",
       "name": "keyword.other.concatination.fortran"
     },
     "submodule-definition": {
@@ -5030,7 +5030,7 @@
               "name": "entity.name.module.submodule.fortran"
             }
           },
-          "end": "(?ix)\\s*\\b(?:(end\\s*submodule)(?:\\s+([a-z_]\\w*))?|(end))\\b \\s*([^;!\\n]+)?(?=[;!\\n])",
+          "end": "(?i)\\s*\\b(?:(end\\s*submodule)(?:\\s+([a-z_]\\w*))?|(end))\\b\\s*([^;!\\n]+)?(?=[;!\\n])",
           "endCaptures": {
             "1": {
               "name": "keyword.other.endsubmodule.fortran"
@@ -5048,7 +5048,7 @@
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(?i)(?=\\b(?:end\\s*[;!\\n]|end\\s*submodule\\b))",
+              "end": "(?i)(?=\\bend(?:\\s*[;!\\n]|\\s*submodule\\b))",
               "name": "meta.block.specification.submodule.fortran",
               "patterns": [
                 {
@@ -5058,7 +5058,7 @@
                       "name": "keyword.control.contains.fortran"
                     }
                   },
-                  "end": "(?i)(?=\\s*(?:end\\s*[;!\\n]|end\\s*submodule\\b))",
+                  "end": "(?i)(?=\\s*end(?:\\s*[;!\\n]|\\s*submodule\\b))",
                   "name": "meta.block.contains.fortran",
                   "patterns": [
                     {
@@ -5118,7 +5118,7 @@
                   "name": "entity.name.function.subroutine.fortran"
                 }
               },
-              "end": "(?ix)\\b(?:(end\\s*subroutine)(?:\\s+([a-z_]\\w*))?|(end))\\b \\s*([^;!\\n]+)?(?=[;!\\n])",
+              "end": "(?i)\\b(?:(end\\s*subroutine)(?:\\s+([a-z_]\\w*))?|(end))\\b\\s*([^;!\\n]+)?(?=[;!\\n])",
               "endCaptures": {
                 "1": {
                   "name": "keyword.other.endsubroutine.fortran"
@@ -5148,8 +5148,8 @@
                   ]
                 },
                 {
-                  "begin": "(?i)(?!\\b(?:end\\s*[;!\\n]|end\\s*subroutine\\b))",
-                  "end": "(?i)(?=\\b(?:end\\s*[;!\\n]|end\\s*subroutine\\b))",
+                  "begin": "(?i)(?!\\bend(?:\\s*[;!\\n]|\\s*subroutine\\b))",
+                  "end": "(?i)(?=\\bend(?:\\s*[;!\\n]|\\s*subroutine\\b))",
                   "name": "meta.block.specification.subroutine.fortran",
                   "patterns": [
                     {
@@ -5159,7 +5159,7 @@
                           "name": "keyword.control.contains.fortran"
                         }
                       },
-                      "end": "(?i)(?=(?:end\\s*[;!\\n]|end\\s*subroutine\\b))",
+                      "end": "(?i)(?=end(?:\\s*[;!\\n]|\\s*subroutine\\b))",
                       "name": "meta.block.contains.fortran",
                       "patterns": [
                         {
@@ -5179,7 +5179,7 @@
       ]
     },
     "sync-all-statement": {
-      "begin": "(?i)\\b(sync all|sync memory)(\\s*(?=\\())?",
+      "begin": "(?i)\\b(sync (?:all|memory))(\\s*(?=\\())?",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.sync-all-memory.fortran"
@@ -5202,7 +5202,7 @@
       ]
     },
     "sync-statement": {
-      "begin": "(?i)\\b(sync images|sync team)\\s*(?=\\()",
+      "begin": "(?i)\\b(sync (?:images|team))\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.sync-images-team.fortran"
@@ -5233,8 +5233,8 @@
       "match": "(?i)\\s*\\b(target)\\b"
     },
     "type-specification-statements": {
-      "begin": "(?ix)(?=\\b(?:character|class|complex|double\\s*precision|double\\s*complex|integer|logical|real|type|dimension)\\b(?![^'\";!\\n:]*\\bfunction\\b))",
-      "end": "(?=[\\);!\\n])",
+      "begin": "(?i)(?=\\b(?:character|class|complex|double\\s*precision|double\\s*complex|integer|logical|real|type|dimension)\\b(?![^'\";!\\n:]*\\bfunction\\b))",
+      "end": "(?=[);!\\n])",
       "name": "meta.specification.type.fortran",
       "patterns": [
         {
@@ -5257,7 +5257,7 @@
                   "name": "punctuation.comma.fortran"
                 }
               },
-              "end": "(?=::|[,&;!\\n])",
+              "end": "(?=::|[,\\&;!\\n])",
               "patterns": [
                 {
                   "include": "#access-attribute"
@@ -5596,7 +5596,7 @@
     "word": {
       "patterns": [
         {
-          "match": "(?i)(?:\\G|(?<=\\%))\\s*\\b([a-z]\\w*)\\b"
+          "match": "(?i)(?:\\G|(?<=%))\\s*\\b([a-z]\\w*)\\b"
         }
       ]
     }