tm-grammars 1.25.3 → 1.27.0

package/grammars/nix.json

@@ -453,6 +453,9 @@
         {
           "include": "#operator-unary"
         },
+        {
+          "include": "#operator-binary"
+        },
         {
           "include": "#constants"
         },
@@ -493,8 +496,7 @@
           "include": "#attrset-or-function"
         },
         {
-          "match": "(\\bor\\b|\\.|\\|>|<\\||==|!=?|<=?|>=?|&&|\\|\\||->|//|\\?|\\+\\+|[-*]|/(?=([^*]|$))|\\+)",
-          "name": "keyword.operator.nix"
+          "include": "#operator-binary"
         },
         {
           "include": "#constants"
@@ -975,6 +977,10 @@
         }
       ]
     },
+    "operator-binary": {
+      "match": "(\\bor\\b|\\.|\\|>|<\\||==|!=?|<=?|>=?|&&|\\|\\||->|//|\\?|\\+\\+|[-*]|/(?=([^*]|$))|\\+)",
+      "name": "keyword.operator.nix"
+    },
     "operator-unary": {
       "match": "([-!])",
       "name": "keyword.operator.unary.nix"

package/grammars/openscad.json

@@ -0,0 +1,151 @@
+{
+  "displayName": "OpenSCAD",
+  "fileTypes": [
+    "scad"
+  ],
+  "foldingStartMarker": "/\\*\\*|\\{\\s*$",
+  "foldingStopMarker": "\\*\\*/|^\\s*}",
+  "name": "openscad",
+  "patterns": [
+    {
+      "captures": {
+        "1": {
+          "name": "keyword.control.scad"
+        }
+      },
+      "match": "^(module)\\s.*$",
+      "name": "meta.function.scad"
+    },
+    {
+      "match": "\\b(if|else|for|intersection_for|assign|render|function|include|use)\\b",
+      "name": "keyword.control.scad"
+    },
+    {
+      "begin": "/\\*\\*(?!/)",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.comment.scad"
+        }
+      },
+      "end": "\\*/",
+      "name": "comment.block.documentation.scad"
+    },
+    {
+      "begin": "/\\*",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.comment.scad"
+        }
+      },
+      "end": "\\*/",
+      "name": "comment.block.scad"
+    },
+    {
+      "captures": {
+        "1": {
+          "name": "punctuation.definition.comment.scad"
+        }
+      },
+      "match": "(//).*$\\n?",
+      "name": "comment.line.double-slash.scad"
+    },
+    {
+      "begin": "\"",
+      "end": "\"",
+      "name": "string.quoted.double.scad",
+      "patterns": [
+        {
+          "match": "\\\\.",
+          "name": "constant.character.escape.scad"
+        }
+      ]
+    },
+    {
+      "begin": "'",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.scad"
+        }
+      },
+      "end": "'",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.scad"
+        }
+      },
+      "name": "string.quoted.single.scad",
+      "patterns": [
+        {
+          "match": "\\\\(x\\h{2}|[012][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)",
+          "name": "constant.character.escape.scad"
+        }
+      ]
+    },
+    {
+      "begin": "\"",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.scad"
+        }
+      },
+      "end": "\"",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.scad"
+        }
+      },
+      "name": "string.quoted.double.scad",
+      "patterns": [
+        {
+          "match": "\\\\(x\\h{2}|[012][0-7]{0,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)",
+          "name": "constant.character.escape.scad"
+        }
+      ]
+    },
+    {
+      "match": "\\b(abs|acos|asun|atan2??|ceil|cos|exp|floor|ln|log|lookup|max|min|pow|rands|round|sign|sin|sqrt|tan|str|cube|sphere|cylinder|polyhedron|scale|rotate|translate|mirror|multimatrix|color|minkowski|hull|union|difference|intersection|echo)\\b",
+      "name": "support.function.scad"
+    },
+    {
+      "match": ";",
+      "name": "punctuation.terminator.statement.scad"
+    },
+    {
+      "match": ",[\\t |]*",
+      "name": "meta.delimiter.object.comma.scad"
+    },
+    {
+      "match": "\\.",
+      "name": "meta.delimiter.method.period.scad"
+    },
+    {
+      "match": "[{}]",
+      "name": "meta.brace.curly.scad"
+    },
+    {
+      "match": "[()]",
+      "name": "meta.brace.round.scad"
+    },
+    {
+      "match": "[]\\[]",
+      "name": "meta.brace.square.scad"
+    },
+    {
+      "match": "[!$%\\&*]|--?|\\+\\+|[+~]|===?|=|!==??|<=|>=|<<=|>>=|>>>=|<>|[!<>]|&&|\\|\\||\\?:|\\*=|(?<!\\()/=|%=|\\+=|-=|&=|\\^=|\\b(in|instanceof|new|delete|typeof|void)\\b",
+      "name": "keyword.operator.scad"
+    },
+    {
+      "match": "\\b((0([Xx])\\h+)|([0-9]+(\\.[0-9]+)?))\\b",
+      "name": "constant.numeric.scad"
+    },
+    {
+      "match": "\\btrue\\b",
+      "name": "constant.language.boolean.true.scad"
+    },
+    {
+      "match": "\\bfalse\\b",
+      "name": "constant.language.boolean.false.scad"
+    }
+  ],
+  "scopeName": "source.scad"
+}

package/grammars/proto.json

@@ -71,7 +71,7 @@
           "include": "#comments"
         },
         {
-          "begin": "([A-Za-z][0-9A-Z_a-z]*)\\s*(=)\\s*(0[Xx]\\h+|[0-9]+)",
+          "begin": "([A-Za-z][0-9A-Z_a-z]*)\\s*(=)\\s*(-?0[Xx]\\h+|-?[0-9]+)",
           "beginCaptures": {
             "1": {
               "name": "variable.other.proto"
@@ -98,7 +98,7 @@
       ]
     },
     "field": {
-      "begin": "\\s*(optional|repeated|required)?\\s*\\b([.\\w]+)\\s+(\\w+)\\s*(=)\\s*(0[Xx]\\h+|[0-9]+)",
+      "begin": "\\s*(optional|repeated|required)?\\s*(\\.?[.\\w]+)\\s+(\\w+)\\s*(=)\\s*(0[Xx]\\h+|[0-9]+)",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.proto"
@@ -150,7 +150,7 @@
       ]
     },
     "ident": {
-      "match": "[A-Za-z][0-9A-Z_a-z]*",
+      "match": "\\.?[A-Za-z][.0-9A-Z_a-z]*",
       "name": "entity.name.class.proto"
     },
     "import": {
@@ -202,7 +202,7 @@
       ]
     },
     "mapfield": {
-      "begin": "\\s*(map)\\s*(<)\\s*([.\\w]+)\\s*,\\s*([.\\w]+)\\s*(>)\\s+(\\w+)\\s*(=)\\s*(\\d+)",
+      "begin": "\\s*(map)\\s*(<)\\s*(\\.?[.\\w]+)\\s*,\\s*(\\.?[.\\w]+)\\s*(>)\\s+(\\w+)\\s*(=)\\s*(\\d+)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.proto"
@@ -470,7 +470,7 @@
       "name": "storage.type.proto"
     },
     "string": {
-      "match": "('(['[^']])*')|(\"([\"[^\"]])*\")",
+      "match": "([\"'])(?:\\\\.|[^\\\\])*?\\1",
       "name": "string.quoted.double.proto"
     },
     "subMsgOption": {