Skip to content

Commit

Permalink
Added syntactic coloration for AQL expressions.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ylussaud
ylussaud committed Feb 21, 2024
1 parent e8c5e88 commit 5652d9c
Show file tree
Hide file tree
Showing 2 changed files with 213 additions and 13 deletions.
220 changes: 208 additions & 12 deletions plugins/org.eclipse.acceleo.aql.tm/grammar/acceleo.tmLanguage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,22 @@
"query-body" : {
"name": "meta.expression.aql",
"begin": "(?<==)(?:\\s*)",
"end": "(?=/\\])"
"end": "(?=/\\])",
"patterns": [
{
"include": "#expression-keyword"
},
{
"include": "#expression-string"
},
{
"include": "#expression-real"
},
{
"include": "#expression-type"
}
]

},
"query-tag-close": {
"name": "keyword.other.query.acceleo",
Expand Down Expand Up @@ -427,7 +442,22 @@
"template-pre-condition-expression": {
"name": "meta.expression.aql",
"begin": "(?<=\\()",
"end": "(?=\\)\\s*(\\bpost\\b|\\]))"
"end": "(?=\\)\\s*(\\bpost\\b|\\]))",
"patterns": [
{
"include": "#expression-keyword"
},
{
"include": "#expression-string"
},
{
"include": "#expression-real"
},
{
"include": "#expression-type"
}
]

},
"template-pre-condition-ender": {
"name": "keyword.other.template.precondition.acceleo",
Expand Down Expand Up @@ -456,7 +486,22 @@
"template-post-treatment-expression": {
"name": "meta.expression.aql",
"begin": "(?<=\\()",
"end": "(?=\\)\\s*\\])"
"end": "(?=\\)\\s*\\])",
"patterns": [
{
"include": "#expression-keyword"
},
{
"include": "#expression-string"
},
{
"include": "#expression-real"
},
{
"include": "#expression-type"
}
]

},
"template-post-treatment-ender": {
"name": "keyword.other.template.posttreatment.acceleo",
Expand Down Expand Up @@ -501,7 +546,22 @@
"statement-file-destination-expression": {
"name": "meta.expression.aql",
"begin": "(?<=\\()",
"end": "(?=,)"
"end": "(?=,)",
"patterns": [
{
"include": "#expression-keyword"
},
{
"include": "#expression-string"
},
{
"include": "#expression-real"
},
{
"include": "#expression-type"
}
]

},
"statement-file-mode": {
"name": "keyword.other.statement.file.mode.acceleo",
Expand All @@ -510,7 +570,22 @@
"statement-file-encoding-expression": {
"name": "meta.expression.aql",
"begin": "(?<=,)",
"end": "(?=\\)\\s*\\])"
"end": "(?=\\)\\s*\\])",
"patterns": [
{
"include": "#expression-keyword"
},
{
"include": "#expression-string"
},
{
"include": "#expression-real"
},
{
"include": "#expression-type"
}
]

},
"statement-file-header-tag-close": {
"name": "keyword.other.statement.file.acceleo",
Expand Down Expand Up @@ -581,7 +656,22 @@
"statement-for-expression": {
"name": "meta.expression.aql",
"begin": "(?<=\\|)",
"end": "(?=\\))"
"end": "(?=\\))",
"patterns": [
{
"include": "#expression-keyword"
},
{
"include": "#expression-string"
},
{
"include": "#expression-real"
},
{
"include": "#expression-type"
}
]

},
"statement-for-separator": {
"name": "keyword.other.statement.for.acceleo",
Expand All @@ -590,7 +680,22 @@
"statement-for-separator-expression": {
"name": "meta.expression.aql",
"begin": "(?<=\\()",
"end": "(?=\\)\\s*\\])"
"end": "(?=\\)\\s*\\])",
"patterns": [
{
"include": "#expression-keyword"
},
{
"include": "#expression-string"
},
{
"include": "#expression-real"
},
{
"include": "#expression-type"
}
]

},
"statement-for-footer": {
"name": "keyword.other.statement.for.acceleo",
Expand All @@ -615,7 +720,22 @@
"statement-if-expression": {
"name": "meta.expression.aql",
"begin": "(?<=\\()",
"end": "(?=\\)\\s*\\])"
"end": "(?=\\)\\s*\\])",
"patterns": [
{
"include": "#expression-keyword"
},
{
"include": "#expression-string"
},
{
"include": "#expression-real"
},
{
"include": "#expression-type"
}
]

},
"statement-if-header-tag-close": {
"name": "keyword.other.statement.if.acceleo",
Expand All @@ -642,7 +762,22 @@
"statement-elseif-expression": {
"name": "meta.expression.aql",
"begin": "(?<=\\()",
"end": "(?=\\)\\s*\\])"
"end": "(?=\\)\\s*\\])",
"patterns": [
{
"include": "#expression-keyword"
},
{
"include": "#expression-string"
},
{
"include": "#expression-real"
},
{
"include": "#expression-type"
}
]

},
"statement-elseif-tag-close": {
"name": "keyword.other.statement.elseif.acceleo",
Expand Down Expand Up @@ -696,7 +831,22 @@
"statement-let-expression": {
"name": "meta.expression.aql",
"begin": "(?<==)",
"end": "(?=(,|\\]))"
"end": "(?=(,|\\]))",
"patterns": [
{
"include": "#expression-keyword"
},
{
"include": "#expression-string"
},
{
"include": "#expression-real"
},
{
"include": "#expression-type"
}
]

},
"statement-let-footer": {
"name": "keyword.other.statement.let.acceleo",
Expand Down Expand Up @@ -730,7 +880,22 @@
"statement-protected-expression": {
"name": "meta.expression.aql",
"begin": "(?<=\\()",
"end": "(?=\\)\\s*(?=(\\]|\\bstartTagPrefix\\b|\\bendTagPrefix\\b)))"
"end": "(?=\\)\\s*(?=(\\]|\\bstartTagPrefix\\b|\\bendTagPrefix\\b)))",
"patterns": [
{
"include": "#expression-keyword"
},
{
"include": "#expression-string"
},
{
"include": "#expression-real"
},
{
"include": "#expression-type"
}
]

},
"statement-protected-start-prefix": {
"name": "keyword.other.statement.protected.acceleo",
Expand Down Expand Up @@ -771,7 +936,38 @@
},
"statement-expression-expression": {
"name": "meta.expression.aql",
"match": "(?<=\\[).*?(?=/\\])"
"begin": "(?<=\\[)",
"end": "(?=/\\])",
"patterns": [
{
"include": "#expression-keyword"
},
{
"include": "#expression-string"
},
{
"include": "#expression-real"
},
{
"include": "#expression-type"
}
]
},
"expression-keyword": {
"name": "meta.expression.aql.keyword.acceleo",
"match": "\\b(if|then|else|endif|let|in|true|false|null|not|and|or)\\b"
},
"expression-string": {
"name": "meta.expression.aql.string.acceleo",
"match": "'([^'\\\\]|\\\\.)*'"
},
"expression-real": {
"name": "meta.expression.aql.real.acceleo",
"match": "[0-9]+(\\.[0-9]+)*"
},
"expression-type": {
"name": "meta.expression.aql.type.acceleo",
"match": "((Sequence|OrderedSet)\\((String|Integer|Real|Boolean|(\\w+(::\\w+))|(\\{(\\w+(::\\w+))(,\\s*(\\w+(::\\w+)))*\\}))\\))|String|Integer|Real|Boolean|(\\w+(::\\w+))|(\\{(\\w+(::\\w+))(,\\s*(\\w+(::\\w+)))*\\})"
},
"statement-expression-tag-close": {
"name": "keyword.other.statement.expression.acceleo",
Expand Down
6 changes: 5 additions & 1 deletion plugins/org.eclipse.acceleo.aql.tm/themes/Acceleo-Theme-Eclipse-Light.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
.meta.main { font-weight: bold; color: #3F7F5F; }
.meta.parameter.type { font-style: italic; color: #6b6b6b; }
.meta.expression.aql { color: #006bd7; }
.meta.expression.aql.keyword { color: #7F0055; }
.meta.expression.aql.string { color: #2A00FF; }
.meta.expression.aql.real { color: #2A00FF; }
.meta.expression.aql.type { font-style: italic; color: #6b6b6b; }
.meta.documentation.tag.value { font-style: italic; color: #3F7F5F; }

.storage { font-weight: bold; color: #7F0055; }
Expand All @@ -38,4 +42,4 @@

.editor { background-color: rgba(255, 255, 255, 1); color: rgba(0, 0, 0, 1); }
.editor.lineHighlight { background-color: rgba(232, 242, 254, 1); }
.editor.selection {}
.editor.selection {}

0 comments on commit 5652d9c

Please sign in to comment.