github-linguist 5.3.3 → 6.0.0

data/grammars/source.fortran.json

@@ -1,16 +1,6 @@
 {
-  "comment": "?i: has to be added everywhere because fortran is case insensitive; NB: order of matching matters",
-  "fileTypes": [
-    "f",
-    "F",
-    "f77",
-    "F77",
-    "for",
-    "FOR",
-    "fpp",
-    "FPP"
-  ],
   "name": "Fortran - Punchcard",
+  "scopeName": "source.fortran",
   "patterns": [
     {
       "include": "#preprocessor-rule-enabled"
@@ -22,58 +12,24 @@
       "include": "#preprocessor-rule-other"
     },
     {
-      "comment": "built-in constants",
-      "match": "(?i:(r8|r4|\\.TRUE\\.|\\.FALSE\\.))",
-      "name": "constant.language.fortran"
+      "name": "constant.language.fortran",
+      "match": "(?i:(r8|r4|\\.TRUE\\.|\\.FALSE\\.))"
     },
     {
-      "comment": "numbers",
-      "match": "\\b[\\+\\-]?[0-9]+\\.?[0-9a-zA-Z_]*\\b",
-      "name": "constant.numeric.fortran"
+      "name": "constant.numeric.fortran",
+      "match": "\\b[\\+\\-]?[0-9]+\\.?[0-9a-zA-Z_]*\\b"
     },
     {
-      "begin": "(?x:\t\t\t\t\t\t\t\t# extended mode\n\t\t\t\t\t^\n\t\t\t\t\t\\s*\t\t\t\t\t\t\t\t\t# start of line and possibly some space\n\t\t\t\t\t([a-zA-Z\\(\\)]*)(?<!end)\t\t\t\t# 1: possibly some type specification but not the word end\n\t\t\t\t\t\\s*\t\t\t\t\t\t\t\t\t# possibly some space\n\t\t\t\t\t(?i:(function|subroutine))\\b\t\t# 2: function or subroutine\n\t\t\t\t\t\\s+\t\t\t\t\t\t\t\t\t# some space\n\t\t\t\t\t([A-Za-z_][A-Za-z0-9_]*)\t\t\t# 3: name\n\t\t\t\t\t)",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.type.fortran"
-        },
-        "2": {
-          "name": "storage.type.function.fortran"
-        },
-        "3": {
-          "name": "entity.name.function.fortran"
-        }
-      },
-      "comment": "First line of function/subroutine definition",
-      "end": "(?x:\t\t\t\t\t\t\t\t\t# extended mode\n\t\t\t\t\t((?i:end))\t\t\t\t\t\t\t# 1: the word end\n\t\t\t\t\t(\t\t\t\t\t\t\t\t\t# followed by\n\t\t\t\t\t\t$\t\t\t\t\t\t\t\t# end of line\n\t\t\t\t\t|\t\t\t\t\t\t\t\t\t# or\n\t\t\t\t\t\t\\s*\t\t\t\t\t\t\t\t# possibly some space\n\t\t\t\t\t\t(?i:(function|subroutine))\t\t# 2: function or subroutine\n\t\t\t\t\t\t((\\s+[A-Za-z_][A-Za-z0-9_]*)?)\t# 3: possibly the name\n\t\t\t\t\t)\n\t\t\t\t\t)",
-      "endCaptures": {
-        "1": {
-          "name": "keyword.other.fortran"
-        },
-        "3": {
-          "name": "storage.type.function.fortran"
-        },
-        "4": {
-          "name": "entity.name.function.end.fortran"
-        }
-      },
       "name": "meta.function.fortran",
+      "begin": "(?x:\t\t\t\t\t\t\t\t# extended mode\n\t\t\t\t\t^\n\t\t\t\t\t\\s*\t\t\t\t\t\t\t\t\t# start of line and possibly some space\n\t\t\t\t\t([a-zA-Z\\(\\)]*)(?\u003c!end)\t\t\t\t# 1: possibly some type specification but not the word end\n\t\t\t\t\t\\s*\t\t\t\t\t\t\t\t\t# possibly some space\n\t\t\t\t\t(?i:(function|subroutine))\\b\t\t# 2: function or subroutine\n\t\t\t\t\t\\s+\t\t\t\t\t\t\t\t\t# some space\n\t\t\t\t\t([A-Za-z_][A-Za-z0-9_]*)\t\t\t# 3: name\n\t\t\t\t\t)",
+      "end": "(?x:\t\t\t\t\t\t\t\t\t# extended mode\n\t\t\t\t\t((?i:end))\t\t\t\t\t\t\t# 1: the word end\n\t\t\t\t\t(\t\t\t\t\t\t\t\t\t# followed by\n\t\t\t\t\t\t$\t\t\t\t\t\t\t\t# end of line\n\t\t\t\t\t|\t\t\t\t\t\t\t\t\t# or\n\t\t\t\t\t\t\\s*\t\t\t\t\t\t\t\t# possibly some space\n\t\t\t\t\t\t(?i:(function|subroutine))\t\t# 2: function or subroutine\n\t\t\t\t\t\t((\\s+[A-Za-z_][A-Za-z0-9_]*)?)\t# 3: possibly the name\n\t\t\t\t\t)\n\t\t\t\t\t)",
       "patterns": [
         {
           "begin": "\\G\\s*(\\()",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.parameters.begin.fortran"
-            }
-          },
           "end": "\\)",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.parameters.end.fortran"
-            }
-          },
           "patterns": [
             {
+              "match": "([^\\s),]*)\\s*(,)?",
               "captures": {
                 "1": {
                   "name": "variable.parameter.fortran"
@@ -81,10 +37,19 @@
                 "2": {
                   "name": "punctuation.separator.arguments.fortan"
                 }
-              },
-              "match": "([^\\s),]*)\\s*(,)?"
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.parameters.begin.fortran"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.parameters.end.fortran"
+            }
+          }
         },
         {
           "include": "$self"
@@ -92,271 +57,272 @@
         {
           "include": "source.fortran.modern"
         }
-      ]
-    },
-    {
-      "begin": "\\b(?i:(integer|real|double\\s+precision|complex|logical|character))\\b(?=.*::)",
+      ],
       "beginCaptures": {
         "1": {
           "name": "storage.type.fortran"
+        },
+        "2": {
+          "name": "storage.type.function.fortran"
+        },
+        "3": {
+          "name": "entity.name.function.fortran"
         }
       },
-      "comment": "Line of type specification",
-      "end": "(?=!)|$",
+      "endCaptures": {
+        "1": {
+          "name": "keyword.other.fortran"
+        },
+        "3": {
+          "name": "storage.type.function.fortran"
+        },
+        "4": {
+          "name": "entity.name.function.end.fortran"
+        }
+      }
+    },
+    {
       "name": "meta.specification.fortran",
+      "begin": "\\b(?i:(integer|real|double\\s+precision|complex|logical|character))\\b(?=.*::)",
+      "end": "(?=!)|$",
       "patterns": [
         {
           "include": "$self"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.fortran"
+        }
+      }
     },
     {
-      "comment": "statements controling the flow of the program",
-      "match": "\\b(?i:(go\\s*to|assign|to|if|then|else|elseif|end\\s*if|continue|stop|pause|do|end\\s*do|while|cycle))\\b",
-      "name": "keyword.control.fortran"
+      "name": "keyword.control.fortran",
+      "match": "\\b(?i:(go\\s*to|assign|to|if|then|else|elseif|end\\s*if|continue|stop|pause|do|end\\s*do|while|cycle))\\b"
     },
     {
-      "comment": "programming units",
-      "match": "\\b(?i:(program|end\\s+program|entry|block\\s+data|call|return|contains|include))\\b",
-      "name": "keyword.control.programming-units.fortran"
+      "name": "keyword.control.programming-units.fortran",
+      "match": "\\b(?i:(program|end\\s+program|entry|block\\s+data|call|return|contains|include))\\b"
     },
     {
-      "comment": "i/o statements",
-      "match": "\\b(?i:(open|close|read|write|print|inquire|backspace|endfile|format))\\b",
-      "name": "keyword.control.io.fortran"
+      "name": "keyword.control.io.fortran",
+      "match": "\\b(?i:(open|close|read|write|print|inquire|backspace|endfile|format))\\b"
     },
     {
-      "comment": "operators",
-      "match": "((?<!\\=)\\=(?!\\=)|\\-|\\+|\\/\\/|\\/|(?!^)\\*|::)",
-      "name": "keyword.operator.fortran"
+      "name": "keyword.operator.fortran",
+      "match": "((?\u003c!\\=)\\=(?!\\=)|\\-|\\+|\\/\\/|\\/|(?!^)\\*|::)"
     },
     {
-      "comment": "logical operators",
-      "match": "(?i:(\\.and\\.|\\.or\\.|\\.eq\\.|\\.lt\\.|\\.le\\.|\\.gt\\.|\\.ge\\.|\\.ne\\.|\\.not\\.|\\.eqv\\.|\\.neqv\\.))",
-      "name": "keyword.operator.logical.fortran"
+      "name": "keyword.operator.logical.fortran",
+      "match": "(?i:(\\.and\\.|\\.or\\.|\\.eq\\.|\\.lt\\.|\\.le\\.|\\.gt\\.|\\.ge\\.|\\.ne\\.|\\.not\\.|\\.eqv\\.|\\.neqv\\.))"
     },
     {
-      "comment": "argument related intrisics",
-      "match": "\\b(?i:(present)(?=\\())",
-      "name": "keyword.other.instrisic.argument.fortran"
+      "name": "keyword.other.instrisic.argument.fortran",
+      "match": "\\b(?i:(present)(?=\\())"
     },
     {
-      "comment": "numeric intrisics",
-      "match": "\\b(?i:(abs|aimag|aint|anint|cmplx|conjg|dble|dim|dprod|int|max|min|mod|nint|real|sign|digits|epsilon|huge|maxexponent|minexponent|precision|radix|range|tiny)(?=\\())",
-      "name": "keyword.other.instrisic.numeric.fortran"
+      "name": "keyword.other.instrisic.numeric.fortran",
+      "match": "\\b(?i:(abs|aimag|aint|anint|cmplx|conjg|dble|dim|dprod|int|max|min|mod|nint|real|sign|digits|epsilon|huge|maxexponent|minexponent|precision|radix|range|tiny)(?=\\())"
     },
     {
-      "comment": "character string intrinsics",
-      "match": "\\b(?i:(achar|adjustl|adjustr|char|iachar|ichar|index|len_trim|repeat|scan|string|trim|verify|len)(?=\\())",
-      "name": "keyword.other.instrisic.string.fortran"
+      "name": "keyword.other.instrisic.string.fortran",
+      "match": "\\b(?i:(achar|adjustl|adjustr|char|iachar|ichar|index|len_trim|repeat|scan|string|trim|verify|len)(?=\\())"
     },
     {
-      "comment": "mathematical intrisics",
-      "match": "\\b(?i:(((acos|asin|atan|atan2|cos|cosh|exp|log|log10|sin|sinh|sqrt|tan|tanh)(?=\\())|(random_number|random_seed)))\\b",
-      "name": "keyword.other.instrisic.math.fortran"
+      "name": "keyword.other.instrisic.math.fortran",
+      "match": "\\b(?i:(((acos|asin|atan|atan2|cos|cosh|exp|log|log10|sin|sinh|sqrt|tan|tanh)(?=\\())|(random_number|random_seed)))\\b"
     },
     {
-      "comment": "data kind intrinsics",
-      "match": "\\b(?i:(kind|selected_int_kind|selected_real_kind|transfer)(?=\\())",
-      "name": "keyword.other.instrisic.data.fortran"
+      "name": "keyword.other.instrisic.data.fortran",
+      "match": "\\b(?i:(kind|selected_int_kind|selected_real_kind|transfer)(?=\\())"
     },
     {
-      "comment": "logical intrinsics",
-      "match": "\\b(?i:(logical)(?=\\())",
-      "name": "keyword.other.instrisic.logical.fortran"
+      "name": "keyword.other.instrisic.logical.fortran",
+      "match": "\\b(?i:(logical)(?=\\())"
     },
     {
-      "comment": "bit operations intrinsics",
-      "match": "\\b(?i:(((bit_size|btest|iand|ibclr|ibits|ibset|ieor|ior|ishift|ishiftc|not)(?=\\())|mvbits))\\b",
-      "name": "keyword.other.instrisic.bit.fortran"
+      "name": "keyword.other.instrisic.bit.fortran",
+      "match": "\\b(?i:(((bit_size|btest|iand|ibclr|ibits|ibset|ieor|ior|ishift|ishiftc|not)(?=\\())|mvbits))\\b"
     },
     {
-      "comment": "floating point intrinsics",
-      "match": "\\b(?i:(exponent|fraction|nearest|rrspacing|scale|set_exponent|spacing)(?=\\())",
-      "name": "keyword.other.instrisic.floating-point.fortran"
+      "name": "keyword.other.instrisic.floating-point.fortran",
+      "match": "\\b(?i:(exponent|fraction|nearest|rrspacing|scale|set_exponent|spacing)(?=\\())"
     },
     {
-      "comment": "matrix/vector/array intrisics",
-      "match": "\\b(?i:(((dot_product|sum|matmul|transpose|all|any|count|maxval|minval|maxloc|minloc|product|sum|lbound|ubound|shape|size|merge|pack|unpack|reshape|spread|cshift|eoshift)(?=\\())|(where|elsewhere|end\\s*where)))\\b",
-      "name": "keyword.other.instrisic.array.fortran"
+      "name": "keyword.other.instrisic.array.fortran",
+      "match": "\\b(?i:(((dot_product|sum|matmul|transpose|all|any|count|maxval|minval|maxloc|minloc|product|sum|lbound|ubound|shape|size|merge|pack|unpack|reshape|spread|cshift|eoshift)(?=\\())|(where|elsewhere|end\\s*where)))\\b"
     },
     {
-      "comment": "other intrisics",
-      "match": "\\b(?i:(((dtime)(?=\\())|(date_and_time|system_clock)))\\b",
-      "name": "keyword.other.instrisic.fortran"
+      "name": "keyword.other.instrisic.fortran",
+      "match": "\\b(?i:(((dtime)(?=\\())|(date_and_time|system_clock)))\\b"
     },
     {
-      "comment": "data specification",
-      "match": "\\b(?i:(integer|real|double\\s+precision|complex|logical|character|block\\sdata|operator|assignment))\\b",
-      "name": "storage.type.fortran"
+      "name": "storage.type.fortran",
+      "match": "\\b(?i:(integer|real|double\\s+precision|complex|logical|character|block\\sdata|operator|assignment))\\b"
     },
     {
-      "comment": "data type attributes",
-      "match": "\\b(?i:(dimension|common|equivalence|parameter|external|intrinsic|save|data|implicit\\s*none|implicit|intent|in|out|inout))\\b",
-      "name": "storage.modifier.fortran"
+      "name": "storage.modifier.fortran",
+      "match": "\\b(?i:(dimension|common|equivalence|parameter|external|intrinsic|save|data|implicit\\s*none|implicit|intent|in|out|inout))\\b"
     },
     {
-      "applyEndPatternLast": 1,
+      "name": "string.quoted.single.fortran",
       "begin": "'",
+      "end": "'",
+      "patterns": [
+        {
+          "name": "constant.character.escape.apostrophe.fortran",
+          "match": "''"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.fortran"
         }
       },
-      "comment": "String",
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.fortran"
         }
       },
-      "name": "string.quoted.single.fortran",
-      "patterns": [
-        {
-          "match": "''",
-          "name": "constant.character.escape.apostrophe.fortran"
-        }
-      ]
+      "applyEndPatternLast": true
     },
     {
-      "applyEndPatternLast": 1,
+      "name": "string.quoted.double.fortran",
       "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "name": "constant.character.escape.quote.fortran",
+          "match": "\"\""
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.fortran"
         }
       },
-      "comment": "String",
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.fortran"
         }
       },
-      "name": "string.quoted.double.fortran",
-      "patterns": [
-        {
-          "match": "\"\"",
-          "name": "constant.character.escape.quote.fortran"
-        }
-      ]
+      "applyEndPatternLast": true
     },
     {
+      "name": "comment.line.c.fortran",
       "begin": "^[Cc](?=\\b|[Cc])",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.comment.fortran"
-        }
-      },
       "end": "$\\n?",
-      "name": "comment.line.c.fortran",
       "patterns": [
         {
           "match": "\\\\\\s*\\n"
         }
-      ]
-    },
-    {
-      "begin": "^\\*",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.comment.fortran"
         }
-      },
-      "end": "$\\n?",
+      }
+    },
+    {
       "name": "comment.line.asterisk.fortran",
+      "begin": "^\\*",
+      "end": "$\\n?",
       "patterns": [
         {
           "match": "\\\\\\s*\\n"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.comment.fortran"
+        }
+      }
     },
     {
+      "name": "meta.preprocessor.diagnostic.fortran",
       "begin": "^\\s*#\\s*(error|warning)\\b",
-      "captures": {
-        "1": {
-          "name": "keyword.control.import.error.fortran"
-        }
-      },
       "end": "$\\n?",
-      "name": "meta.preprocessor.diagnostic.fortran",
       "patterns": [
         {
-          "match": "(?>\\\\\\s*\\n)",
-          "name": "punctuation.separator.continuation.fortran"
+          "name": "punctuation.separator.continuation.fortran",
+          "match": "(?\u003e\\\\\\s*\\n)"
         }
-      ]
-    },
-    {
-      "begin": "^\\s*#\\s*(include|import)\\b\\s+",
+      ],
       "captures": {
         "1": {
-          "name": "keyword.control.import.include.fortran"
+          "name": "keyword.control.import.error.fortran"
         }
-      },
-      "end": "(?=(?://|/\\*))|$\\n?",
+      }
+    },
+    {
       "name": "meta.preprocessor.fortran.include",
+      "begin": "^\\s*#\\s*(include|import)\\b\\s+",
+      "end": "(?=(?://|/\\*))|$\\n?",
       "patterns": [
         {
-          "match": "(?>\\\\\\s*\\n)",
-          "name": "punctuation.separator.continuation.fortran"
+          "name": "punctuation.separator.continuation.fortran",
+          "match": "(?\u003e\\\\\\s*\\n)"
         },
         {
+          "name": "string.quoted.double.include.fortran",
           "begin": "\"",
+          "end": "\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.fortran"
             }
           },
-          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.fortran"
             }
-          },
-          "name": "string.quoted.double.include.fortran"
+          }
         },
         {
-          "begin": "<",
+          "name": "string.quoted.other.lt-gt.include.fortran",
+          "begin": "\u003c",
+          "end": "\u003e",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.fortran"
             }
           },
-          "end": ">",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.fortran"
             }
-          },
-          "name": "string.quoted.other.lt-gt.include.fortran"
+          }
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "keyword.control.import.include.fortran"
+        }
+      }
     },
     {
       "include": "#pragma-mark"
     },
     {
+      "name": "meta.preprocessor.fortran",
       "begin": "^\\s*#\\s*(define|defined|elif|else|if|ifdef|ifndef|line|pragma|undef)\\b",
-      "captures": {
-        "1": {
-          "name": "keyword.control.import.fortran"
-        }
-      },
       "end": "(?=(?://|/\\*))|$\\n?",
-      "name": "meta.preprocessor.fortran",
       "patterns": [
         {
-          "match": "(?>\\\\\\s*\\n)",
-          "name": "punctuation.separator.continuation.fortran"
+          "name": "punctuation.separator.continuation.fortran",
+          "match": "(?\u003e\\\\\\s*\\n)"
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "keyword.control.import.fortran"
+        }
+      }
     }
   ],
   "repository": {
     "disabled": {
       "begin": "^\\s*#\\s*if(n?def)?\\b.*$",
-      "comment": "eat nested preprocessor if(def)s",
       "end": "^\\s*#\\s*endif\\b.*$",
       "patterns": [
         {
@@ -368,6 +334,8 @@
       ]
     },
     "pragma-mark": {
+      "name": "meta.section",
+      "match": "^\\s*(#\\s*(pragma\\s+mark)\\s+(.*))",
       "captures": {
         "1": {
           "name": "meta.preprocessor.fortran"
@@ -378,27 +346,20 @@
         "3": {
           "name": "meta.toc-list.pragma-mark.fortran"
         }
-      },
-      "match": "^\\s*(#\\s*(pragma\\s+mark)\\s+(.*))",
-      "name": "meta.section"
+      }
     },
     "preprocessor-rule-disabled": {
       "begin": "^\\s*(#(if)\\s+(0)\\b).*",
-      "captures": {
-        "1": {
-          "name": "meta.preprocessor.fortran"
-        },
-        "2": {
-          "name": "keyword.control.import.if.fortran"
-        },
-        "3": {
-          "name": "constant.numeric.preprocessor.fortran"
-        }
-      },
       "end": "^\\s*(#\\s*(endif)\\b)",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b)",
+          "end": "(?=^\\s*#\\s*endif\\b.*$)",
+          "patterns": [
+            {
+              "include": "$base"
+            }
+          ],
           "captures": {
             "1": {
               "name": "meta.preprocessor.fortran"
@@ -406,18 +367,11 @@
             "2": {
               "name": "keyword.control.import.else.fortran"
             }
-          },
-          "end": "(?=^\\s*#\\s*endif\\b.*$)",
-          "patterns": [
-            {
-              "include": "$base"
-            }
-          ]
+          }
         },
         {
-          "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
           "name": "comment.block.preprocessor.if-branch",
+          "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
           "patterns": [
             {
               "include": "#disabled"
@@ -427,10 +381,7 @@
             }
           ]
         }
-      ]
-    },
-    "preprocessor-rule-enabled": {
-      "begin": "^\\s*(#(if)\\s+(0*1)\\b)",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.fortran"
@@ -441,20 +392,15 @@
         "3": {
           "name": "constant.numeric.preprocessor.fortran"
         }
-      },
+      }
+    },
+    "preprocessor-rule-enabled": {
+      "begin": "^\\s*(#(if)\\s+(0*1)\\b)",
       "end": "^\\s*(#\\s*(endif)\\b)",
       "patterns": [
         {
-          "begin": "^\\s*(#\\s*(else)\\b).*",
-          "captures": {
-            "1": {
-              "name": "meta.preprocessor.fortran"
-            },
-            "2": {
-              "name": "keyword.control.import.else.fortran"
-            }
-          },
           "contentName": "comment.block.preprocessor.else-branch",
+          "begin": "^\\s*(#\\s*(else)\\b).*",
           "end": "(?=^\\s*#\\s*endif\\b.*$)",
           "patterns": [
             {
@@ -463,10 +409,17 @@
             {
               "include": "#pragma-mark"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "meta.preprocessor.fortran"
+            },
+            "2": {
+              "name": "keyword.control.import.else.fortran"
+            }
+          }
         },
         {
-          "begin": "",
           "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
           "patterns": [
             {
@@ -474,26 +427,35 @@
             }
           ]
         }
-      ]
-    },
-    "preprocessor-rule-other": {
-      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
+      ],
       "captures": {
         "1": {
           "name": "meta.preprocessor.fortran"
         },
         "2": {
-          "name": "keyword.control.import.fortran"
+          "name": "keyword.control.import.if.fortran"
+        },
+        "3": {
+          "name": "constant.numeric.preprocessor.fortran"
         }
-      },
+      }
+    },
+    "preprocessor-rule-other": {
+      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
       "end": "^\\s*(#\\s*(endif)\\b).*$",
       "patterns": [
         {
           "include": "$base"
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "meta.preprocessor.fortran"
+        },
+        "2": {
+          "name": "keyword.control.import.fortran"
+        }
+      }
     }
-  },
-  "scopeName": "source.fortran",
-  "uuid": "45253F88-F7CC-49C5-9C32-F3FADD2AB579"
-}
+  }
+}