Skip to content

merge from main #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Mar 28, 2023
Merged

merge from main #294

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8675170
merge dev to main (#226)
ymc9 Mar 3, 2023
4e7c880
doc: change blog link in readme from dev.to to ZenStack blog
jiashengguo Mar 3, 2023
5aae301
doc: change blog link in readme from dev.to to ZenStack blog (#231)
jiashengguo Mar 3, 2023
fa75f59
merge dev to main (#235)
ymc9 Mar 4, 2023
d0bb796
merge dev to main (#247)
ymc9 Mar 7, 2023
bf9f4cb
merge dev to main (#253)
ymc9 Mar 9, 2023
19253ca
merge dev to main (#255)
ymc9 Mar 14, 2023
dd3ae27
merge dev to main (#274)
ymc9 Mar 19, 2023
aa15de1
merge dev to main (#282)
ymc9 Mar 21, 2023
26dd30f
fix: update langium version
ymc9 Mar 26, 2023
ae5964d
bump version
ymc9 Mar 26, 2023
23180ce
fix: update langium version (#290)
ymc9 Mar 27, 2023
74062ca
Merge remote-tracking branch 'origin/main' into chore/merge-from-main
ymc9 Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 60 additions & 62 deletions packages/language/syntaxes/zmodel.tmLanguage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,71 +1,69 @@
{
"name": "zmodel",
"scopeName": "source.zmodel",
"fileTypes": [
".zmodel"
],
"patterns": [
{
"include": "#comments"
},
{
"name": "keyword.control.zmodel",
"match": "\\b(Any|Asc|BigInt|Boolean|Bytes|ContextType|DateTime|Decimal|Desc|FieldReference|Float|Int|Json|Null|Object|String|TransitiveFieldReference|attribute|datasource|enum|function|generator|in|model|plugin|sort)\\b"
},
{
"name": "string.quoted.double.zmodel",
"begin": "\"",
"end": "\"",
"patterns": [
"name": "zmodel",
"scopeName": "source.zmodel",
"fileTypes": [".zmodel"],
"patterns": [
{
"include": "#string-character-escape"
}
]
},
{
"name": "string.quoted.single.zmodel",
"begin": "'",
"end": "'",
"patterns": [
"include": "#comments"
},
{
"include": "#string-character-escape"
}
]
}
],
"repository": {
"comments": {
"patterns": [
"name": "keyword.control.zmodel",
"match": "\\b(Any|Asc|BigInt|Boolean|Bytes|ContextType|DateTime|Decimal|Desc|FieldReference|Float|Int|Json|Null|Object|String|TransitiveFieldReference|attribute|datasource|enum|function|generator|in|model|plugin|sort)\\b"
},
{
"name": "comment.block.zmodel",
"begin": "/\\*",
"beginCaptures": {
"0": {
"name": "punctuation.definition.comment.zmodel"
}
},
"end": "\\*/",
"endCaptures": {
"0": {
"name": "punctuation.definition.comment.zmodel"
}
}
"name": "string.quoted.double.zmodel",
"begin": "\"",
"end": "\"",
"patterns": [
{
"include": "#string-character-escape"
}
]
},
{
"begin": "//",
"beginCaptures": {
"1": {
"name": "punctuation.whitespace.comment.leading.zmodel"
}
},
"end": "(?=$)",
"name": "comment.line.zmodel"
"name": "string.quoted.single.zmodel",
"begin": "'",
"end": "'",
"patterns": [
{
"include": "#string-character-escape"
}
]
}
],
"repository": {
"comments": {
"patterns": [
{
"name": "comment.block.zmodel",
"begin": "/\\*",
"beginCaptures": {
"0": {
"name": "punctuation.definition.comment.zmodel"
}
},
"end": "\\*/",
"endCaptures": {
"0": {
"name": "punctuation.definition.comment.zmodel"
}
}
},
{
"begin": "//",
"beginCaptures": {
"1": {
"name": "punctuation.whitespace.comment.leading.zmodel"
}
},
"end": "(?=$)",
"name": "comment.line.zmodel"
}
]
},
"string-character-escape": {
"name": "constant.character.escape.zmodel",
"match": "\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|u\\{[0-9A-Fa-f]+\\}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)"
}
]
},
"string-character-escape": {
"name": "constant.character.escape.zmodel",
"match": "\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|u\\{[0-9A-Fa-f]+\\}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)"
}
}
}