github-linguist 5.1.0 → 5.2.0

data/grammars/source.cobol.json

@@ -112,12 +112,12 @@
       "name": "constant.language.cobol"
     },
     {
-      "match": "\\b(?<!-)(?i:zeroes|zeros|zeros|zero|spaces|space|quotes|quote|low-values|low-value|high-values|high-value)(?=\\s|\\.|\\))",
+      "match": "\\b(?<!-)(?i:zeroes|alphabetic|alphanumeric|zeros|zeros|zero|spaces|space|quotes|quote|low-values|low-value|high-values|high-value)(?=\\s|\\.|,|\\))",
       "name": "constant.language.figurative.cobol"
     },
     {
-      "begin": "(?i:EXEC\\s*SQL)",
-      "end": "(?i:END-EXEC|end\\s*exec)",
+      "begin": "(?i:exec\\s*sql)",
+      "end": "(?i:end-exec|end\\s*exec)",
       "name": "string.quoted.cobol",
       "patterns": [
         {
@@ -130,8 +130,8 @@
       ]
     },
     {
-      "begin": "(?i:EXEC\\s*CICS)",
-      "end": "(?i:END-EXEC|end\\s*exec)",
+      "begin": "(?i:exec\\s*cics)",
+      "end": "(?i:end\\-exec|end\\s*exec)",
       "name": "string.quoted.cobol",
       "patterns": [
         {
@@ -153,8 +153,8 @@
       ]
     },
     {
-      "begin": "(?i:EXEC\\s*ADO)",
-      "end": "(?i:END-EXEC|end\\s*exec)",
+      "begin": "(?i:exec\\s*ado)",
+      "end": "(?i:end\\-exec|end\\s*exec)",
       "name": "string.quoted.cobol",
       "patterns": [
         {
@@ -167,8 +167,8 @@
       ]
     },
     {
-      "begin": "(?i:EXEC\\s*HTML)",
-      "end": "(?i:END-EXEC|end\\s*exec)",
+      "begin": "(?i:exec\\s*html)",
+      "end": "(?i:end\\-exec|end\\s*exec)",
       "name": "string.quoted.cobol",
       "patterns": [
         {
@@ -270,11 +270,11 @@
       "name": "string.quoted.single.cobol"
     },
     {
-      "match": "\\b(?<!-)(?i:id\\s*division|identification\\s*division|identification|property-id|getter|setter|entry|function-id|attribute|interface-id|factory|ctl|class-control|options|environment\\s*division|environment-name|environment-value|environment|configuration\\s*section|configuration|decimal-point|call-convention|special-names|cursor\\s*is|update|picture\\s*symbol|currency\\s*sign|currency|repository|input-output\\s*section|input-output|file\\s*section|file-control|select|optional|i-o-control|data\\s*division|working-storage\\s*section|working-storage|section|local-storage|linkage\\s*section|linkage|communication|report|screen\\s*section|fd|rd|cd|sd|printing|procedure\\s*division|procedure|debugging|declaratives|security|based-storage|size|font|national-edited|national)\\b[^-]",
+      "match": "\\b(?<!-)(?i:id\\s*division|identification\\s*division|identification|property-id|getter|setter|entry|function-id|end\\s*attribute|attribute|interface-id|factory|ctl|class-control|options|environment\\s*division|environment-name|environment-value|environment|configuration\\s*section|configuration|decimal-point|call-convention|special-names|cursor\\s*is|update|picture\\s*symbol|currency\\s*sign|currency|repository|input-output\\s*section|input-output|file\\s*section|file-control|select|optional|i-o-control|data\\s*division|working-storage\\s*section|working-storage|section|local-storage|linkage\\s*section|linkage|communication|report|screen\\s*section|fd|rd|cd|sd|printing|procedure\\s*division|procedure|debugging|declaratives|security|based-storage|size|font|national-edited|national)\\b[^-]",
       "name": "keyword.identifiers.cobol"
     },
     {
-      "match": "(\\s|^)(?i)(?i:end\\s*class|end\\s*property|end\\s*method|end\\s*object|exit\\s*method|end\\s*program|end\\s*operator|create|reset|instance|delegate|end-delegate|delegate-id|declare|debug-line|debug-name|debug-contents|sort-return|exception-object|return-code|as||stop\\srun|stop)(?=\\s|\\.|,|$)",
+      "match": "(\\s|^)(?i)(?i:end\\s*class|end\\s*property|end\\s*method|end\\s*object|exit\\s*method|end\\s*program|end\\s*operator|create|reset|instance|delegate|end-delegate|delegate-id|declare|debug-line|debug-name|debug-contents|sort-return|exception-object|return-code|json-code|as||stop\\srun|stop)(?=\\s|\\.|,|$)",
       "name": "keyword.identifiers.cobol"
     },
     {
@@ -294,7 +294,7 @@
       "name": "keyword.otherverbs.cobol"
     },
     {
-      "match": "\\b(?<!-)(?i:assign|external|organization|indexed|column|plus|line\\*s*sequential|sequential|access|dynamic|relative|label|block|contains|standard|records|record\\s*key|record|is|alternate|duplicates|reel|tape|terminal|disk|disc|mode|random)(?=\\s|\\.)",
+      "match": "\\b(?<!-)(?i:assign|external|organization|indexed|column|plus|line\\*s*sequential|sequential|access|dynamic|relative|label|block|contains|standard|records|record\\s*key|record|is|alternate|duplicates|reel|tape|terminal|disk\\sfilename|disk|disc|mode|random)(?=\\s|\\.)",
       "name": "keyword.identifers.cobol"
     },
     {
@@ -407,7 +407,15 @@
       "name": "keyword.verbs.cobol"
     },
     {
-      "match": "\\b(?<!-)(?i:picture\\s+is|picture|pic\\s+is|pic)\\s+[-+sS\\*$09aAbBxXpPnNzZ/,.]*\\([0-9]*\\)[vV\\.][-+s\\*$09aAbBsSnNxXzZ/,]*\\([0-9]*\\)",
+      "match": "\\b(?<!-)(?i:picture\\s+is|picture|pic\\s+is|pic)\\s+[-+sS\\*$09aAbBxXpPnNzZ/,.]*\\([0-9]*\\)[vV][-+sS\\*$09aAbBxXpPnNzZ/,\\.]*\\([0-9]*\\)[-|+]",
+      "name": "storage.type.picture.cobol"
+    },
+    {
+      "match": "\\b(?<!-)(?i:picture\\s+is|picture|pic\\s+is|pic)\\s+[-+sS\\*$09aAbBxXpPnNzZ/,.]*\\([0-9]*\\)[vV][-+sS\\*$09aAbBxXpPnNzZ/,\\.]*\\([0-9]*\\)",
+      "name": "storage.type.picture.cobol"
+    },
+    {
+      "match": "\\b(?<!-)(?i:picture\\s+is|picture|pic\\s+is|pic)\\s+[-+sS\\*$09aAbBxXpPnNzZ/,.]*\\([0-9]*\\)[vV\\.][-+s\\*$09aAbBsSnNxXzZ/,]*[0-9]*",
       "name": "storage.type.picture.cobol"
     },
     {
@@ -471,7 +479,7 @@
       "name": "keyword.xml.cobol"
     },
     {
-      "match": "\\b(?<!-)(?i:json|name\\sof)(?=\\s|\\.|$)",
+      "match": "\\b(?<!-)(?i:json\\s*generate|json|end-json|name\\sof)(?=\\s|\\.|$)",
       "name": "keyword.json.cobol"
     },
     {

data/grammars/source.coffee.json

@@ -164,23 +164,24 @@
       ]
     },
     {
-      "match": "(?<![\\w$])(/)(?![/*+?])(.+?)(/)[gimuy]*(?!\\s*[\\w$/(])",
-      "captures": {
+      "begin": "(?<![\\w$])(/)(?=(?![/*+?])(.+)(/)[gimuy]*(?!\\s*[\\w$/(]))",
+      "beginCaptures": {
         "1": {
           "name": "punctuation.definition.string.begin.coffee"
-        },
-        "2": {
-          "patterns": [
-            {
-              "include": "source.js.regexp"
-            }
-          ]
-        },
-        "3": {
+        }
+      },
+      "end": "(/)[gimuy]*(?!\\s*[\\w$/(])",
+      "endCaptures": {
+        "1": {
           "name": "punctuation.definition.string.end.coffee"
         }
       },
-      "name": "string.regexp.coffee"
+      "name": "string.regexp.coffee",
+      "patterns": [
+        {
+          "include": "source.js.regexp"
+        }
+      ]
     },
     {
       "match": "\\b(?<![\\.\\$])(break|by|catch|continue|else|finally|for|in|of|if|return|switch|then|throw|try|unless|when|while|until|loop|do|export|import|default|from|as|yield|async|await|(?<=for)\\s+own)(?!\\s*:)\\b",

data/grammars/source.csound-document.json

@@ -246,8 +246,8 @@
     "tags": {
       "patterns": [
         {
-          "begin": "(<)([a-zA-Z0-9:-]+)(>)",
-          "end": "(</)([a-zA-Z0-9:-]+)(>)",
+          "begin": "(<)([0-9A-Za-z:-]+)(>)",
+          "end": "(</)([0-9A-Za-z:-]+)(>)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.begin.csound-document"

data/grammars/source.csound.json

@@ -330,7 +330,7 @@
               },
               "patterns": [
                 {
-                  "match": "(\\(|\\)|[#'])|(\\\\(?:\\(|\\)|[#']))",
+                  "match": "([#'()])|(\\\\[#'()])",
                   "captures": {
                     "1": {
                       "name": "invalid.illegal.csound"
@@ -351,7 +351,7 @@
               "end": "\\}\\}",
               "patterns": [
                 {
-                  "match": "(\\(|\\)|[#'])|(\\\\(?:\\(|\\)|[#']))",
+                  "match": "([#'()])|(\\\\[#'()])",
                   "captures": {
                     "1": {
                       "name": "invalid.illegal.csound"
@@ -504,14 +504,18 @@
                   "match": "\\\\\\\\[aAbBnNrRtT]"
                 },
                 {
-                  "include": "#escapeSequences"
+                  "include": "#bracedStringContents"
                 },
                 {
-                  "include": "#formatSpecifiers"
+                  "include": "#lineContinuations"
                 },
                 {
                   "name": "constant.character.escape.csound",
                   "match": "%[!nNrRtT]|[~^]{1,2}"
+                },
+                {
+                  "name": "invalid.illegal.csound",
+                  "match": "[^\"\\\\\\n]*\\n"
                 }
               ]
             }

data/grammars/source.erlang.json

@@ -486,7 +486,7 @@
               "name": "punctuation.separator.function-arity.erlang"
             }
           },
-          "match": "\\b(fun)\\s*+(([a-z][a-zA-Z\\d@_]*+)\\s*+(:)\\s*+)?([a-z][a-zA-Z\\d@_]*+)\\s*(/)"
+          "match": "\\b(fun)\\s+(([a-z][a-zA-Z\\d@_]*+)\\s*+(:)\\s*+)?([a-z][a-zA-Z\\d@_]*+)\\s*(/)"
         },
         {
           "begin": "\\b(fun)\\b",

data/grammars/source.gerber.json

@@ -0,0 +1,339 @@
+{
+  "name": "Gerber Image",
+  "scopeName": "source.gerber",
+  "fileTypes": [
+    "gbr",
+    "gtl",
+    "gbl",
+    "gbs",
+    "gto",
+    "gts",
+    "gtp",
+    "gbo",
+    "gbp",
+    "gko",
+    "gm1",
+    "gpt",
+    "gpb",
+    "fab",
+    "pho"
+  ],
+  "firstLineMatch": "^G04 .*\\r?\\n",
+  "patterns": [
+    {
+      "contentName": "comment.block.gerber",
+      "begin": "G04",
+      "end": "(?=\\*)",
+      "beginCaptures": {
+        "0": {
+          "name": "entity.name.function.begin-comment.gerber"
+        }
+      }
+    },
+    {
+      "name": "meta.command.block.gerber",
+      "begin": "%",
+      "end": "%",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.section.begin.extended.command.gerber"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.end.extended.command.gerber"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#extendedCommands"
+        }
+      ]
+    },
+    {
+      "name": "punctuation.separator.list.comma.gerber",
+      "match": ","
+    },
+    {
+      "name": "keyword.operator.terminator.gerber",
+      "match": "\\*"
+    },
+    {
+      "name": "keyword.control.eof.gerber",
+      "match": "M02"
+    },
+    {
+      "name": "entity.name.function.${1:/downcase}.command.gerber",
+      "match": "(?x)\n(FS|MO|AD|AM|AB|D[0-9]+|G01|G02|G03|G74|G75|LP|LM|LR|LS|G36|G37\n|SR|G04|TF|TA|TO|TD|M02|G54|G55|G70|G71|G90|G91|M00|M01|IP|AS\n|IR|MI|OF|SF|IN|LN)"
+    },
+    {
+      "name": "meta.${1:/downcase}.ordinate.gerber",
+      "match": "(X|Y)([-+]?[0-9]+)",
+      "captures": {
+        "1": {
+          "name": "storage.name.var.${1:/downcase}.gerber"
+        },
+        "2": {
+          "name": "constant.numeric.decimal.gerber"
+        }
+      }
+    },
+    {
+      "name": "constant.numeric.decimal.gerber",
+      "match": "[-+]?(?:[0-9]*\\.[0-9]+|[0-9]+)"
+    }
+  ],
+  "repository": {
+    "extendedCommands": {
+      "patterns": [
+        {
+          "begin": "\\G(AM)([A-Za-z_.0-9$]+)",
+          "end": "(?=%)",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.function.macro.gerber"
+            },
+            "2": {
+              "name": "entity.name.function.macro.gerber"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#macroInnards"
+            }
+          ]
+        },
+        {
+          "name": "meta.aperture.definition.gerber",
+          "begin": "\\G(AD)(D[0-9]+)([^,%*\\s]+)",
+          "end": "(?=%)",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.function.aperture.gerber"
+            },
+            "2": {
+              "name": "entity.name.function.d-code.gerber"
+            },
+            "3": {
+              "name": "variable.parameter.aperture-name.gerber"
+            }
+          },
+          "patterns": [
+            {
+              "begin": "\\G(?=,)",
+              "end": "(?=%)",
+              "patterns": [
+                {
+                  "match": "(X)?([^*%X]+)",
+                  "captures": {
+                    "1": {
+                      "name": "punctuation.delimiter.modifiers.list.gerber"
+                    },
+                    "2": {
+                      "patterns": [
+                        {
+                          "include": "$self"
+                        }
+                      ]
+                    }
+                  }
+                },
+                {
+                  "include": "$self"
+                }
+              ]
+            },
+            {
+              "include": "$self"
+            }
+          ]
+        },
+        {
+          "name": "meta.attribute.gerber",
+          "begin": "\\G(TF|TA|TO)([^,*%]+)(,)",
+          "end": "(?=\\*|%)",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.attribute.gerber"
+            },
+            "2": {
+              "name": "entity.other.attribute-name.gerber"
+            }
+          },
+          "patterns": [
+            {
+              "match": ",",
+              "name": "punctuation.separator.list.comma.gerber"
+            },
+            {
+              "match": "[^,%*]",
+              "name": "string.unquoted.attribute.gerber"
+            }
+          ]
+        },
+        {
+          "match": "\\G(TD)([^,*%]+)",
+          "captures": {
+            "1": {
+              "name": "entity.name.function.delete.attribute.gerber"
+            },
+            "2": {
+              "name": "entity.other.attribute-name.gerber"
+            }
+          }
+        },
+        {
+          "match": "\\G(FS)([LT][AI])",
+          "captures": {
+            "1": {
+              "name": "entity.name.function.format-spec.gerber"
+            },
+            "2": {
+              "name": "constant.language.option.modes.gerber"
+            }
+          }
+        },
+        {
+          "match": "\\G(OF)(A)([-+]?[0-9]+)(B)([-+]?[0-9]+)",
+          "captures": {
+            "1": {
+              "name": "entity.name.function.offset.gerber"
+            },
+            "2": {
+              "name": "storage.name.var.offset.a-axis.gerber"
+            },
+            "3": {
+              "name": "constant.numeric.decimal.gerber"
+            },
+            "4": {
+              "name": "storage.name.var.offset.b-axis.gerber"
+            },
+            "5": {
+              "name": "constant.numeric.decimal.gerber"
+            }
+          }
+        },
+        {
+          "match": "\\G(MO)(IN|MM)",
+          "captures": {
+            "1": {
+              "name": "entity.name.function.unit-mode.gerber"
+            },
+            "2": {
+              "name": "constant.language.unit-type.gerber"
+            }
+          }
+        },
+        {
+          "match": "\\G(IP)(POS|NEG)",
+          "captures": {
+            "1": {
+              "name": "entity.name.function.image-polarity.gerber"
+            },
+            "2": {
+              "name": "constant.language.image-polarity.gerber"
+            }
+          }
+        },
+        {
+          "match": "\\G(LP)(C|D)",
+          "captures": {
+            "1": {
+              "name": "entity.name.function.load-polarity.gerber"
+            },
+            "2": {
+              "name": "constant.language.polarity-type.gerber"
+            }
+          }
+        },
+        {
+          "match": "\\G(LM)(N|XY|X|Y)",
+          "captures": {
+            "1": {
+              "name": "entity.name.function.load-mirroring.gerber"
+            },
+            "2": {
+              "name": "constant.language.mirror-type.gerber"
+            }
+          }
+        },
+        {
+          "begin": "\\G(LN)",
+          "end": "(?=\\*|%)",
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.function.load-name.gerber"
+            }
+          },
+          "contentName": "variable.parameter.gerber"
+        },
+        {
+          "include": "$self"
+        }
+      ]
+    },
+    "macroInnards": {
+      "patterns": [
+        {
+          "name": "comment.line.primitive.gerber",
+          "match": "^\\s*(0)(\\s+([^*%]+)(?=\\*|%|$))",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.primitive.gerber"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#unicodeEscape"
+                }
+              ]
+            },
+            "3": {
+              "name": "string.unquoted.gerber"
+            }
+          }
+        },
+        {
+          "name": "keyword.operator.logical.arithmetic.gerber",
+          "match": "\\+|-|x|X|/"
+        },
+        {
+          "match": "(\\()|(\\))",
+          "captures": {
+            "1": {
+              "name": "punctuation.section.equation.begin.gerber"
+            },
+            "2": {
+              "name": "punctuation.section.equation.end.gerber"
+            }
+          }
+        },
+        {
+          "name": "variable.positional.parameter.gerber",
+          "match": "(\\$)[1-9][0-9]*",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.variable.gerber"
+            }
+          }
+        },
+        {
+          "name": "keyword.operator.assignment.gerber",
+          "match": "="
+        },
+        {
+          "include": "$self"
+        }
+      ]
+    },
+    "unicodeEscape": {
+      "name": "constant.character.escape.unicode.gerber",
+      "match": "(\\\\)u[0-9A-Fa-f]{4}",
+      "captures": {
+        "1": {
+          "name": "punctuation.definition.escape.backslash.gerber"
+        }
+      }
+    }
+  }
+}