tm-grammars 1.22.18 → 1.23.0

package/grammars/riscv.json

@@ -9,7 +9,7 @@
   "name": "riscv",
   "patterns": [
     {
-      "match": "\\b(la|lb|lh|lw|ld|nop|li|mv|not|neg|negw|sext\\.w|seqz|snez|sltz|sgtz|beqz|bnez|blez|bgez|bltz|bgtz|bgt|ble|bgtu|bleu|j|jal|jr|ret|call|tail|fence|csr[r|w|s|c]|csr[w|s|c]i)\\b",
+      "match": "\\b(la|lb|lh|lw|ld|nop|li|mv|not|neg|negw|sext\\.w|seqz|snez|sltz|sgtz|beqz|bnez|blez|bgez|bltz|bgtz|bgt|ble|bgtu|bleu|j|jal|jr|ret|call|tail|fence|csr[r|wsc]|csr[w|sc]i)\\b",
       "name": "support.function.pseudo.riscv"
     },
     {
@@ -25,7 +25,7 @@
       "name": "support.function.riscv.m"
     },
     {
-      "match": "\\b(c\\.addi4spn|c\\.fld|c\\.lq|c\\.lw|c\\.flw|c\\.ld|c\\.fsd|c\\.sq|c\\.sw|c\\.fsw|c\\.sd|c\\.nop|c\\.addi|c\\.jal|c\\.addiw|c\\.li|c\\.addi16sp|c\\.lui|c\\.srli|c\\.srli64|c\\.srai|c\\.srai64|c\\.andi|c\\.sub|c\\.xor|c\\.or|c\\.and|c\\.subw|c\\.addw|c\\.j|c\\.beqz|c\\.bnez)\\b",
+      "match": "\\b(c\\.(?:addi4spn|fld|lq|lw|flw|ld|fsd|sq|sw|fsw|sd|nop|addi|jal|addiw|li|addi16sp|lui|srli|srli64|srai|srai64|andi|sub|xor|or|and|subw|addw|j|beqz|bnez))\\b",
       "name": "support.function.riscv.c"
     },
     {
@@ -33,15 +33,15 @@
       "name": "support.function.riscv.a"
     },
     {
-      "match": "\\b(flw|fsw|fmadd\\.s|fmsub\\.s|fnmsub\\.s|fnmadd\\.s|fadd\\.s|fsub\\.s|fmul\\.s|fdiv\\.s|fsqrt\\.s|fsgnj\\.s|fsgnjn\\.s|fsgnjx\\.s|fmin\\.s|fmax\\.s|fcvt\\.w\\.s|fcvt\\.wu\\.s|fmv\\.x\\.w|feq\\.s|flt\\.s|fle\\.s|fclass\\.s|fcvt\\.s\\.w|fcvt\\.s\\.wu|fmv\\.w\\.x|fcvt\\.l\\.s|fcvt\\.lu\\.s|fcvt\\.s\\.l|fcvt\\.s\\.lu)\\b",
+      "match": "\\b(f(?:lw|sw|madd\\.s|msub\\.s|nmsub\\.s|nmadd\\.s|add\\.s|sub\\.s|mul\\.s|div\\.s|sqrt\\.s|sgnj\\.s|sgnjn\\.s|sgnjx\\.s|min\\.s|max\\.s|cvt\\.w\\.s|cvt\\.wu\\.s|mv\\.x\\.w|eq\\.s|lt\\.s|le\\.s|class\\.s|cvt\\.s\\.w|cvt\\.s\\.wu|mv\\.w\\.x|cvt\\.l\\.s|cvt\\.lu\\.s|cvt\\.s\\.l|cvt\\.s\\.lu))\\b",
       "name": "support.function.riscv.f"
     },
     {
-      "match": "\\b(fld|fsd|fmadd\\.d|fmsub\\.d|fnmsub\\.d|fnmadd\\.d|fadd\\.d|fsub\\.d|fmul\\.d|fdiv\\.d|fsqrt\\.d|fsgnj\\.d|fsgnjn\\.d|fsgnjx\\.d|fmin\\.d|fmax\\.d|fcvt\\.s\\.d|fcvt\\.d\\.s|feq\\.d|flt\\.d|fle\\.d|fclass\\.d|fcvt\\.w\\.d|fcvt\\.wu\\.d|fcvt\\.d\\.w|fcvt\\.d\\.wu|fcvt\\.l\\.d|fcvt\\.lu\\.d|fmv\\.x\\.d|fcvt\\.d\\.l|fcvt\\.d\\.lu|fmv\\.d\\.x)\\b",
+      "match": "\\b(f(?:ld|sd|madd\\.d|msub\\.d|nmsub\\.d|nmadd\\.d|add\\.d|sub\\.d|mul\\.d|div\\.d|sqrt\\.d|sgnj\\.d|sgnjn\\.d|sgnjx\\.d|min\\.d|max\\.d|cvt\\.s\\.d|cvt\\.d\\.s|eq\\.d|lt\\.d|le\\.d|class\\.d|cvt\\.w\\.d|cvt\\.wu\\.d|cvt\\.d\\.w|cvt\\.d\\.wu|cvt\\.l\\.d|cvt\\.lu\\.d|mv\\.x\\.d|cvt\\.d\\.l|cvt\\.d\\.lu|mv\\.d\\.x))\\b",
       "name": "support.function.riscv.d"
     },
     {
-      "match": "\\.(skip|ascii|asciiz|byte|[2|4|8]byte|data|double|float|half|kdata|ktext|space|text|word|dword|dtprelword|dtpreldword|set\\s*(noat|at)|[s|u]leb128|string|incbin|zero|rodata|comm|common)\\b",
+      "match": "\\.(skip|ascii|asciiz|byte|[2|48]byte|data|double|float|half|kdata|ktext|space|text|word|dword|dtprelword|dtpreldword|set\\s*(noat|at)|[s|u]leb128|string|incbin|zero|rodata|comm|common)\\b",
       "name": "storage.type.riscv"
     },
     {
@@ -98,7 +98,7 @@
       "name": "constant.numeric.float.riscv"
     },
     {
-      "match": "\\b(\\d+|0(x|X)[a-fA-F0-9]+)\\b",
+      "match": "\\b(\\d+|0([xX])\\h+)\\b",
       "name": "constant.numeric.integer.riscv"
     },
     {
@@ -144,17 +144,17 @@
       ]
     },
     {
-      "begin": "\\/\\*",
-      "end": "\\*\\/",
+      "begin": "/\\*",
+      "end": "\\*/",
       "name": "comment.block"
     },
     {
-      "begin": "\\/\\/",
+      "begin": "//",
       "end": "\\n",
       "name": "comment.line.double-slash"
     },
     {
-      "begin": "^\\s*\\#\\s*(define)\\s+((?<id>[a-zA-Z_][a-zA-Z0-9_]*))(?:(\\()(\\s*\\g<id>\\s*((,)\\s*\\g<id>\\s*)*(?:\\.\\.\\.)?)(\\)))?",
+      "begin": "^\\s*#\\s*(define)\\s+((?<id>[a-zA-Z_][a-zA-Z0-9_]*))(?:(\\()(\\s*\\g<id>\\s*((,)\\s*\\g<id>\\s*)*(?:\\.\\.\\.)?)(\\)))?",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.import.define.c"
@@ -175,7 +175,7 @@
           "name": "punctuation.definition.parameters.c"
         }
       },
-      "end": "(?=(?://|/\\*))|$",
+      "end": "(?=/[/*])|$",
       "name": "meta.preprocessor.macro.c",
       "patterns": [
         {
@@ -204,13 +204,13 @@
       ]
     },
     {
-      "begin": "^\\s*#\\s*(include|import)\\b\\s+",
+      "begin": "^\\s*#\\s*(i(?:nclude|mport))\\b\\s+",
       "captures": {
         "1": {
           "name": "keyword.control.import.include.c"
         }
       },
-      "end": "(?=(?://|/\\*))|$",
+      "end": "(?=/[/*])|$",
       "name": "meta.preprocessor.c.include",
       "patterns": [
         {
@@ -256,7 +256,7 @@
           "name": "keyword.control.import.c"
         }
       },
-      "end": "(?=(?://|/\\*))|$",
+      "end": "(?=/[/*])|$",
       "name": "meta.preprocessor.c",
       "patterns": [
         {
@@ -275,7 +275,7 @@
       "end": "(?!\\G)",
       "patterns": [
         {
-          "begin": "#|(\\/\\/)",
+          "begin": "#|(//)",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.riscv"

package/grammars/rst.json

@@ -33,13 +33,13 @@
     },
     "block-comment": {
       "begin": "^(\\s*)\\.{2}(\\s+|$)",
-      "end": "^(?=\\S)|^\\s*$",
+      "end": "^(?:(?=\\S)|\\s*$)",
       "name": "comment.block",
       "patterns": [
         {
           "begin": "^\\s{3,}(?=\\S)",
           "name": "comment.block",
-          "while": "^\\s{3}.*|^\\s*$"
+          "while": "^(?:\\s{3}.*|\\s*$)"
         }
       ]
     },
@@ -177,11 +177,11 @@
     "citation": {
       "applyEndPatternLast": 0,
       "begin": "(?<=[\\s\"'(\\[{<]|^)`[^\\s`]",
-      "end": "`_{,2}|^\\s*$",
+      "end": "`_{0,2}|^\\s*$",
       "name": "entity.name.tag"
     },
     "code-block": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -195,7 +195,7 @@
       "while": "^\\1(?=\\s)|^\\s*$"
     },
     "code-block-cmake": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)\\s*(cmake)\\s*$",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)\\s*(cmake)\\s*$",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -215,7 +215,7 @@
       "while": "^\\1(?=\\s)|^\\s*$"
     },
     "code-block-console": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)\\s*(console|shell|bash)\\s*$",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)\\s*(console|shell|bash)\\s*$",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -235,7 +235,7 @@
       "while": "^\\1(?=\\s)|^\\s*$"
     },
     "code-block-cpp": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)\\s*(c|c\\+\\+|cpp|C|C\\+\\+|CPP|Cpp)\\s*$",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)\\s*(c|c\\+\\+|cpp|C|C\\+\\+|CPP|Cpp)\\s*$",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -255,7 +255,7 @@
       "while": "^\\1(?=\\s)|^\\s*$"
     },
     "code-block-dts": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)\\s*(dts|DTS|devicetree)\\s*$",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)\\s*(dts|DTS|devicetree)\\s*$",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -275,7 +275,7 @@
       "while": "^\\1(?=\\s)|^\\s*$"
     },
     "code-block-javascript": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)\\s*(javascript)\\s*$",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)\\s*(javascript)\\s*$",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -295,7 +295,7 @@
       "while": "^\\1(?=\\s)|^\\s*$"
     },
     "code-block-kconfig": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)\\s*([kK]config)\\s*$",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)\\s*([kK]config)\\s*$",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -315,7 +315,7 @@
       "while": "^\\1(?=\\s)|^\\s*$"
     },
     "code-block-py": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)\\s*(python)\\s*$",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)\\s*(python)\\s*$",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -335,7 +335,7 @@
       "while": "^\\1(?=\\s)|^\\s*$"
     },
     "code-block-ruby": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)\\s*(ruby)\\s*$",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)\\s*(ruby)\\s*$",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -355,7 +355,7 @@
       "while": "^\\1(?=\\s)|^\\s*$"
     },
     "code-block-yaml": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)\\s*(ya?ml)\\s*$",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)\\s*(ya?ml)\\s*$",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -432,7 +432,7 @@
       "while": "^\\1(?=\\s)|^\\s*$"
     },
     "domain-cpp": {
-      "begin": "^(\\s*)(\\.{2}\\s+(?:cpp|c):(?:class|struct|function|member|var|type|enum|enum-struct|enum-class|enumerator|union|concept)::)\\s*(?:(@\\w+)|(.*))",
+      "begin": "^(\\s*)(\\.{2}\\s+c(?:pp|):(?:class|struct|function|member|var|type|enum|enum-struct|enum-class|enumerator|union|concept)::)\\s*(?:(@\\w+)|(.*))",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -527,11 +527,11 @@
       "name": "constant.character.escape"
     },
     "footnote": {
-      "match": "^\\s*\\.{2}\\s+\\[(?:[\\w\\.-]+|[#*]|#\\w+)\\]\\s+",
+      "match": "^\\s*\\.{2}\\s+\\[(?:[\\w.\\-]+|[#*]|#\\w+)]\\s+",
       "name": "entity.name.tag"
     },
     "footnote-ref": {
-      "match": "\\[(?:[\\w\\.-]+|[#*])\\]_",
+      "match": "\\[(?:[\\w.\\-]+|[#*])]_",
       "name": "entity.name.tag"
     },
     "ignore": {
@@ -543,13 +543,13 @@
           "match": "<[`*]+>"
         },
         {
-          "match": "{[`*]+}"
+          "match": "\\{[`*]+}"
         },
         {
           "match": "\\([`*]+\\)"
         },
         {
-          "match": "\\[[`*]+\\]"
+          "match": "\\[[`*]+]"
         },
         {
           "match": "\"[`*]+\""
@@ -606,7 +606,7 @@
       "name": "keyword.control"
     },
     "list": {
-      "match": "^\\s*(\\d+\\.|\\* -|[a-zA-Z#]\\.|[iIvVxXmMcC]+\\.|\\(\\d+\\)|\\d+\\)|[*+-])\\s+",
+      "match": "^\\s*(\\d+\\.|\\* -|[a-zA-Z#]\\.|[iIvVxXmMcC]+\\.|\\(\\d+\\)|\\d+\\)|[*+\\-])\\s+",
       "name": "keyword.control"
     },
     "literal": {
@@ -637,7 +637,7 @@
       "while": "^\\1(?=\\s)|^\\s*$"
     },
     "macro": {
-      "match": "\\|[^\\|]+\\|",
+      "match": "\\|[^|]+\\|",
       "name": "entity.name.tag"
     },
     "monospaced": {
@@ -646,7 +646,7 @@
       "name": "string.interpolated"
     },
     "options-list": {
-      "match": "(?:(?:^|,\\s+)(?:[-+]\\w|--?[a-zA-Z][\\w-]+|/\\w+)(?:[ =](?:\\w+|<[^<>]+?>))?)+(?=  |\\t|$)",
+      "match": "(?:(?:^|,\\s+)(?:[\\-+]\\w|--?[a-zA-Z][\\w\\-]+|/\\w+)(?:[ =](?:\\w+|<[^<>]+?>))?)+(?=  |\\t|$)",
       "name": "variable.parameter"
     },
     "raw-html": {
@@ -686,7 +686,7 @@
       ]
     },
     "reference": {
-      "match": "[\\w-]*[a-zA-Z\\d-]__?\\b",
+      "match": "[\\w\\-]*[a-zA-Z\\d\\-]__?\\b",
       "name": "entity.name.tag"
     },
     "replace-include": {
@@ -701,7 +701,7 @@
           "name": "keyword.control"
         }
       },
-      "match": "^\\s*(\\.{2})\\s+(\\|[^\\|]+\\|)\\s+(replace::)"
+      "match": "^\\s*(\\.{2})\\s+(\\|[^|]+\\|)\\s+(replace::)"
     },
     "simple-table": {
       "match": "^[=\\s]+$",
@@ -712,7 +712,7 @@
       "name": "entity.name.tag"
     },
     "table": {
-      "begin": "^\\s*\\+[=+-]+\\+\\s*$",
+      "begin": "^\\s*\\+[=+\\-]+\\+\\s*$",
       "beginCaptures": {
         "0": {
           "name": "keyword.control.table"
@@ -721,13 +721,13 @@
       "end": "^(?![+|])",
       "patterns": [
         {
-          "match": "[=+|-]",
+          "match": "[=+|\\-]",
           "name": "keyword.control.table"
         }
       ]
     },
     "title": {
-      "match": "^(\\*{3,}|#{3,}|\\={3,}|~{3,}|\\+{3,}|-{3,}|`{3,}|\\^{3,}|:{3,}|\"{3,}|_{3,}|'{3,})$",
+      "match": "^(\\*{3,}|#{3,}|={3,}|~{3,}|\\+{3,}|-{3,}|`{3,}|\\^{3,}|:{3,}|\"{3,}|_{3,}|'{3,})$",
       "name": "markup.heading"
     }
   },