Skip to content

Commit

Permalink
chore: fix clarity grammar source
Browse files Browse the repository at this point in the history
  • Loading branch information
@octref
octref committed Jul 14, 2023
1 parent 86622d4 commit b05f180
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 58 deletions.
57 changes: 30 additions & 27 deletions packages/shiki/languages/clarity.tmLanguage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
},
"keyword": {
"name": "constant.language.clarity",
"match": "\\b(?:block-height|burn-block-height|contract-caller|is-in-regtest|stx-liquid-supply|tx-sender)\\b"
"match": "(?<!\\S)(?!-)\\b(?:block-height|burn-block-height|chain-id|contract-caller|is-in-regtest|stx-liquid-supply|tx-sender|tx-sponsor?)\\b(?!\\s*-)"
},
"define-function": {
"begin": "(?x) (\\() \\s* (define-(?:public|private|read-only)) \\s+",
Expand All @@ -85,7 +85,7 @@
"include": "#expression"
},
{
"begin": "(?x) (\\() \\s* ([a-zA-Z][a-zA-Z0-9_\\-\\!\\?]*) \\s*",
"begin": "(?x) (\\() \\s* ([a-zA-Z][\\w\\?\\!\\-]*) \\s*",
"end": "(\\))",
"beginCaptures": {
"1": {
Expand All @@ -103,7 +103,7 @@
"name": "meta.define-function-signature",
"patterns": [
{
"begin": "(?x) (\\() \\s* ([a-zA-Z][a-zA-Z0-9_\\-\\!\\?]*) \\s+",
"begin": "(?x) (\\() \\s* ([a-zA-Z][\\w\\?\\!\\-]*) \\s+",
"end": "(\\))",
"beginCaptures": {
"1": {
Expand All @@ -126,11 +126,14 @@
]
}
]
},
{
"include": "#user-func"
}
]
},
"define-fungible-token": {
"match": "(?x) (\\() \\s* (define-fungible-token) \\s+ ([a-zA-Z][a-zA-Z0-9_\\-\\!\\?]*) (?:\\s+(u\\d+))?",
"match": "(?x) (\\() \\s* (define-fungible-token) \\s+ ([a-zA-Z][\\w\\?\\!\\-]*) (?:\\s+(u\\d+))?",
"captures": {
"1": {
"name": "punctuation.define-fungible-token.start.clarity"
Expand All @@ -150,7 +153,7 @@
}
},
"define-non-fungible-token": {
"begin": "(?x) (\\() \\s* (define-non-fungible-token) \\s+ ([a-zA-Z][a-zA-Z0-9_\\-\\!\\?]*) \\s+",
"begin": "(?x) (\\() \\s* (define-non-fungible-token) \\s+ ([a-zA-Z][\\w\\?\\!\\-]*) \\s+",
"end": "(\\))",
"beginCaptures": {
"1": {
Expand All @@ -176,7 +179,7 @@
]
},
"define-trait": {
"begin": "(?x) (\\() \\s* (define-trait) \\s+ ([a-zA-Z][a-zA-Z0-9_\\-\\!\\?]*) \\s+",
"begin": "(?x) (\\() \\s* (define-trait) \\s+ ([a-zA-Z][\\w\\?\\!\\-]*) \\s+",
"end": "(\\))",
"beginCaptures": {
"1": {
Expand Down Expand Up @@ -215,14 +218,14 @@
"include": "#expression"
},
{
"begin": "(?x) (\\() \\s* ([a-zA-Z][a-zA-Z0-9_\\-\\!\\?]+\\??) \\s+",
"begin": "(?x) (\\() \\s* ([a-zA-Z][\\w\\!\\?\\-]*) \\s+",
"end": "(\\))",
"beginCaptures": {
"1": {
"name": "punctuation.trait-function.start.clarity"
},
"2": {
"name": "entity.name.trait-function-name.clarity variable.other.clarity"
"name": "entity.name.function.clarity"
}
},
"endCaptures": {
Expand Down Expand Up @@ -262,7 +265,7 @@
]
},
"use-trait": {
"begin": "(?x) (\\() \\s* (use-trait) \\s+ ([a-zA-Z][a-zA-Z0-9_\\-\\!\\?]*) \\s+",
"begin": "(?x) (\\() \\s* (use-trait) \\s+ ([a-zA-Z][\\w\\?\\!\\-]*) \\s+",
"end": "(\\))",
"beginCaptures": {
"1": {
Expand All @@ -288,7 +291,7 @@
]
},
"define-constant": {
"begin": "(?x) (\\() \\s* (define-constant) \\s+ ([a-zA-Z][a-zA-Z0-9_\\-\\!\\?]*) \\s+",
"begin": "(?x) (\\() \\s* (define-constant) \\s+ ([a-zA-Z][\\w\\?\\!\\-]*) \\s+",
"end": "(\\))",
"beginCaptures": {
"1": {
Expand All @@ -314,7 +317,7 @@
]
},
"define-data-var": {
"begin": "(?x) (\\() \\s* (define-data-var) \\s+ ([a-zA-Z][a-zA-Z0-9_\\-\\!\\?]*) \\s+",
"begin": "(?x) (\\() \\s* (define-data-var) \\s+ ([a-zA-Z][\\w\\?\\!\\-]*) \\s+",
"end": "(\\))",
"beginCaptures": {
"1": {
Expand Down Expand Up @@ -343,7 +346,7 @@
]
},
"define-map": {
"begin": "(?x) (\\() \\s* (define-map) \\s+ ([a-zA-Z][a-zA-Z0-9_\\-\\!\\?]*) \\s+",
"begin": "(?x) (\\() \\s* (define-map) \\s+ ([a-zA-Z][\\w\\?\\!\\-]*) \\s+",
"end": "(\\))",
"beginCaptures": {
"1": {
Expand Down Expand Up @@ -404,23 +407,23 @@
{
"comment": "unsigned integers",
"name": "constant.numeric.uint.clarity",
"match": "\\bu\\d+\\b"
"match": "(?<!\\S)(?!-)\\bu\\d+\\b(?!\\s*-)"
},
{
"comment": "signed integers",
"name": "constant.numeric.int.clarity",
"match": "\\b\\d+\\b"
"match": "(?<!\\S)(?!-)\\b\\d+\\b(?!\\s*-)"
},
{
"comment": "hexadecimals",
"name": "constant.numeric.hex.clarity",
"match": "\\b0x[0-9a-f]*\\b"
"match": "(?<!\\S)(?!-)\\b0x[0-9a-f]*\\b(?!\\s*-)"
}
]
},
"bool-literal": {
"name": "constant.language.bool.clarity",
"match": "\\b(true|false)\\b"
"match": "(?<!\\S)(?!-)\\b(true|false)\\b(?!\\s*-)"
},
"string-literal": {
"patterns": [
Expand Down Expand Up @@ -467,7 +470,7 @@
"patterns": [
{
"name": "entity.name.tag.tuple-key.clarity",
"match": "([a-zA-Z][a-zA-Z0-9_\\-\\!\\?]*)(?=:)"
"match": "([a-zA-Z][\\w\\?\\!\\-]*)(?=:)"
},
{
"include": "#expression"
Expand Down Expand Up @@ -510,7 +513,7 @@
"optional-literal": {
"patterns": [
{
"match": "\\b(none)\\b",
"match": "(?<!\\S)(?!-)\\b(none)\\b(?!\\s*-)",
"name": "constant.language.none.clarity"
},
{
Expand Down Expand Up @@ -590,16 +593,16 @@
"match": "(?x) (\\() \\s* (?:(string-ascii|string-utf8)\\s+(\\d+)) \\s* (\\))",
"captures": {
"1": {
"name": "punctuation.string-def.start.clarity"
"name": "punctuation.string_type-def.start.clarity"
},
"2": {
"name": "entity.name.type.string.clarity"
"name": "entity.name.type.string_type.clarity"
},
"3": {
"name": "constant.numeric.string-len.clarity"
"name": "constant.numeric.string_type-len.clarity"
},
"4": {
"name": "punctuation.string-def.end.clarity"
"name": "punctuation.string_type-def.end.clarity"
}
}
},
Expand Down Expand Up @@ -712,7 +715,7 @@
"patterns": [
{
"name": "entity.name.tag.tuple-data-type-key.clarity",
"match": "([a-zA-Z][a-zA-Z0-9_\\-\\!\\?]*)(?=:)"
"match": "([a-zA-Z][\\w\\?\\!\\-]*)(?=:)"
},
{
"include": "#data-type"
Expand All @@ -722,7 +725,7 @@
]
},
"built-in-func": {
"begin": "(?x) (\\() \\s* (\\-|\\+|<\\=|>\\=|<|>|\\*|/|and|append|as-contract|as-max-len\\?|asserts!|at-block|begin|concat|contract-call\\?|contract-of|default-to|element-at|filter|fold|ft-burn\\?|ft-get-balance|ft-get-supply|ft-mint\\?|ft-transfer\\?|get-block-info\\?|hash160|if|impl-trait|index-of|is-eq|is-err|is-none|is-ok|is-some|keccak256|len|log2|map|match|merge|mod|nft-burn\\?|nft-get-owner\\?|nft-mint\\?|nft-transfer\\?|not|or|pow|principal-of\\?|print|secp256k1-recover\\?|secp256k1-verify|sha256|sha512|sha512/256|sqrti|stx-burn\\?|stx-get-balance|stx-transfer\\?|to-int|to-uint|try!|unwrap-err-panic|unwrap-err!|unwrap-panic|unwrap!|xor) \\s+",
"begin": "(?x) (\\() \\s* (\\-|\\+|<\\=|>\\=|<|>|\\*|/|and|append|as-contract|as-max-len\\?|asserts!|at-block|begin|bit-and|bit-not|bit-or|bit-shift-left|bit-shift-right|bit-xor|buff-to-int-be|buff-to-int-le|buff-to-uint-be|buff-to-uint-le|concat|contract-call\\?|contract-of|default-to|element-at|element-at\\?|filter|fold|from-consensus-buff\\?|ft-burn\\?|ft-get-balance|ft-get-supply|ft-mint\\?|ft-transfer\\?|get-block-info\\?|get-burn-block-info\\?|hash160|if|impl-trait|index-of|index-of\\?|int-to-ascii|int-to-utf8|is-eq|is-err|is-none|is-ok|is-some|is-standard|keccak256|len|log2|map|match|merge|mod|nft-burn\\?|nft-get-owner\\?|nft-mint\\?|nft-transfer\\?|not|or|pow|principal-construct\\?|principal-destruct\\?|principal-of\\?|print|replace-at\\?|secp256k1-recover\\?|secp256k1-verify|sha256|sha512|sha512/256|slice\\?|sqrti|string-to-int\\?|string-to-uint\\?|stx-account|stx-burn\\?|stx-get-balance|stx-transfer-memo\\?|stx-transfer\\?|to-consensus-buff\\?|to-int|to-uint|try!|unwrap!|unwrap-err!|unwrap-err-panic|unwrap-panic|xor) \\s+",
"end": "(\\))",
"beginCaptures": {
"1": {
Expand All @@ -749,7 +752,7 @@
},
"get-set-func": {
"name": "meta.get-set-func",
"begin": "(?x) (\\() \\s* (var-get|var-set|map-get\\?|map-set|map-insert|map-delete|get) \\s+ ([a-zA-Z][a-zA-Z0-9_\\-\\!\\?]*) \\s*",
"begin": "(?x) (\\() \\s* (var-get|var-set|map-get\\?|map-set|map-insert|map-delete|get) \\s+ ([a-zA-Z][\\w\\?\\!\\-]*) \\s*",
"end": "(\\))",
"beginCaptures": {
"1": {
Expand Down Expand Up @@ -813,7 +816,7 @@
"name": "meta.let-var",
"patterns": [
{
"begin": "(?x) (\\() ([a-zA-Z][a-zA-Z0-9_\\-\\!\\?]*) \\s+",
"begin": "(?x) (\\() ([a-zA-Z][\\w\\?\\!\\-]*) \\s+",
"end": "(\\))",
"beginCaptures": {
"1": {
Expand Down Expand Up @@ -846,7 +849,7 @@
]
},
"user-func": {
"begin": "(?x) (\\() \\s* (([a-zA-Z][a-zA-Z0-9_\\-\\!\\?]*)) \\s*",
"begin": "(?x) (\\() \\s* (([a-zA-Z][\\w\\?\\!\\-]*)) \\s*",
"end": "(\\))",
"beginCaptures": {
"1": {
Expand Down
25 changes: 15 additions & 10 deletions packages/shiki/languages/codeql.tmLanguage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,10 @@
"match": "(?x)\\b(?:abstract)(?:(?!(?:[0-9A-Za-z_])))",
"name": "storage.modifier.abstract.ql"
},
"additional": {
"match": "(?x)\\b(?:additional)(?:(?!(?:[0-9A-Za-z_])))",
"name": "storage.modifier.additional.ql"
},
"bindingset": {
"match": "(?x)\\b(?:bindingset)(?:(?!(?:[0-9A-Za-z_])))",
"name": "storage.modifier.bindingset.ql"
Expand All @@ -539,6 +543,10 @@
"match": "(?x)\\b(?:cached)(?:(?!(?:[0-9A-Za-z_])))",
"name": "storage.modifier.cached.ql"
},
"default": {
"match": "(?x)\\b(?:default)(?:(?!(?:[0-9A-Za-z_])))",
"name": "storage.modifier.default.ql"
},
"deprecated": {
"match": "(?x)\\b(?:deprecated)(?:(?!(?:[0-9A-Za-z_])))",
"name": "storage.modifier.deprecated.ql"
Expand Down Expand Up @@ -588,12 +596,18 @@
{
"include": "#abstract"
},
{
"include": "#additional"
},
{
"include": "#bindingset"
},
{
"include": "#cached"
},
{
"include": "#default"
},
{
"include": "#deprecated"
},
Expand Down Expand Up @@ -644,15 +658,6 @@
"begin": "(?x)(?<=/\\*\\*)([^*]|\\*(?!/))*$",
"while": "(?x)(^|\\G)\\s*([^*]|\\*(?!/))(?=([^*]|[*](?!/))*$)",
"patterns": [
{
"include": "text.html.markdown#fenced_code_block"
},
{
"include": "text.html.markdown#lists"
},
{
"include": "text.html.markdown#inline"
},
{
"match": "(?x)\\G\\s* (@\\S+)",
"name": "keyword.tag.ql"
Expand Down Expand Up @@ -851,7 +856,7 @@
"name": "entity.name.type.namespace.ql"
},
"predicate-or-field-declaration": {
"begin": "(?x)(?:(?=(?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))))(?!(?:(?:(?:\\b(?:_)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:and)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:any)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:as)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:asc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:avg)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:by)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:class)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:concat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:count)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:date)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:desc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:else)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:exists)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:extends)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:false)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:float)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forall)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forex)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:from)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:if)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:implies)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:import)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:in)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:instanceof)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:int)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:max)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:min)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:module)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:newtype)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:none)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:not)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:or)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:order)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:rank)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:result)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictconcat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictcount)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictsum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:string)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:sum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:super)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:then)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:this)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:true)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:unique)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_]))))))|(?:(?:(?:\\b(?:abstract)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:bindingset)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:cached)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:deprecated)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:external)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:final)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:language)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:library)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:override)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:pragma)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:private)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:query)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:signature)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:transient)(?:(?!(?:[0-9A-Za-z_])))))))) | (?=(?:(?:(?:\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:date)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:float)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:int)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:string)(?:(?!(?:[0-9A-Za-z_]))))))) | (?=(?:@[a-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))))",
"begin": "(?x)(?:(?=(?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))))(?!(?:(?:(?:\\b(?:_)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:and)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:any)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:as)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:asc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:avg)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:by)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:class)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:concat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:count)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:date)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:desc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:else)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:exists)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:extends)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:false)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:float)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forall)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forex)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:from)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:if)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:implies)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:import)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:in)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:instanceof)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:int)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:max)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:min)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:module)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:newtype)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:none)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:not)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:or)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:order)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:rank)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:result)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictconcat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictcount)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictsum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:string)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:sum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:super)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:then)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:this)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:true)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:unique)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_]))))))|(?:(?:(?:\\b(?:abstract)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:additional)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:bindingset)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:cached)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:default)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:deprecated)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:external)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:final)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:language)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:library)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:override)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:pragma)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:private)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:query)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:signature)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:transient)(?:(?!(?:[0-9A-Za-z_])))))))) | (?=(?:(?:(?:\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:date)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:float)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:int)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:string)(?:(?!(?:[0-9A-Za-z_]))))))) | (?=(?:@[a-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))))",
"end": "(?x)(?<=\\}|;)",
"name": "meta.block.predicate-or-field-declaration.ql",
"patterns": [
Expand Down
12 changes: 3 additions & 9 deletions packages/shiki/languages/latex.tmLanguage.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
{
"information_for_contributors": [
"This file has been converted from https://github.com/jlelong/vscode-latex-basics/blob/master/syntaxes/LaTeX.tmLanguage.json",
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/jlelong/vscode-latex-basics/commit/30adbfae9dcb0a6477584247ac477f13845d1f5f",
"name": "latex",
"scopeName": "text.tex.latex",
"patterns": [
{
"comment": "This scope identifies partially typed commands such as `\\tab`. We use this to trigger “Command Completion” only when it makes sense.",
Expand Down Expand Up @@ -1337,7 +1330,7 @@
]
},
{
"begin": "(\\s*\\\\begin\\{(tabular[xy*]?|xltabular|longtable|(?:long)?tabu|(?:long|tall)?tblr|NiceTabular[X*]?)\\}(\\s*\\n)?)",
"begin": "(\\s*\\\\begin\\{(tabular[xy*]?|xltabular|longtable|(?:long)?tabu|(?:long|tall)?tblr|NiceTabular[X*]?|booktabs)\\}(\\s*\\n)?)",
"captures": {
"1": {
"patterns": [
Expand Down Expand Up @@ -2361,5 +2354,6 @@
}
]
}
}
},
"scopeName": "text.tex.latex"
}
10 changes: 2 additions & 8 deletions packages/shiki/languages/tex.tmLanguage.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
{
"information_for_contributors": [
"This file has been converted from https://github.com/jlelong/vscode-latex-basics/blob/master/syntaxes/TeX.tmLanguage.json",
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/jlelong/vscode-latex-basics/commit/3ae82b457c28f0368cbbb47024b0245ef1ff3d33",
"name": "tex",
"scopeName": "text.tex",
"patterns": [
{
"captures": {
Expand Down Expand Up @@ -282,5 +275,6 @@
}
]
}
}
},
"scopeName": "text.tex"
}
4 changes: 2 additions & 2 deletions packages/shiki/src/languages.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,7 @@ export const languages: ILanguageRegistration[] = [
path: 'codeql.tmLanguage.json',
displayName: 'CodeQL',
samplePath: 'codeql.sample',
aliases: ['ql'],
embeddedLangs: ['markdown']
aliases: ['ql']
},
{
id: 'coffee',
Expand Down Expand Up @@ -828,6 +827,7 @@ export const languages: ILanguageRegistration[] = [
scopeName: 'text.marko',
path: 'marko.tmLanguage.json',
displayName: 'Marko',
samplePath: 'marko.sample',
embeddedLangs: ['css', 'less', 'scss', 'javascript']
},
{
Expand Down
Loading

0 comments on commit b05f180

Please sign in to comment.