Skip to content

Commit 62e5cc5

Browse files
テンプレートリテラルのエスケープ波括弧が使用できない問題を修正
Fix #16
1 parent 49de418 commit 62e5cc5

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ All notable changes to the "aiscript" extension will be documented in this file.
44

55
Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
66

7+
## 0.1.13
8+
- テンプレートリテラル内の波括弧のエスケープが効いていない問題を修正
9+
710
## 0.1.12
811
- 関数のIntellisenseを追加
912
- https://github.com/aiscript-dev/aiscript/pull/661 - `[].at()`

aiscript/syntaxes/aiscript.tmLanguage.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
"patterns": [
1111
{
1212
"include": "#syntax"
13+
},
14+
{
15+
"include": "#template-strings"
1316
}
1417
],
1518
"repository": {
@@ -24,9 +27,6 @@
2427
{
2528
"include": "#strings"
2629
},
27-
{
28-
"include": "#template-strings"
29-
},
3030
{
3131
"include": "#declarations"
3232
},
@@ -131,7 +131,7 @@
131131
"patterns": [
132132
{
133133
"name": "constant.character.escape.aiscript",
134-
"match": "\\\\."
134+
"match": "\\\\['\"\\\\]"
135135
}
136136
]
137137
},
@@ -142,7 +142,7 @@
142142
"patterns": [
143143
{
144144
"name": "constant.character.escape.aiscript",
145-
"match": "\\\\."
145+
"match": "\\\\['\"\\\\]"
146146
}
147147
]
148148
}
@@ -165,15 +165,19 @@
165165
}
166166
},
167167
"patterns": [
168+
{
169+
"name": "constant.character.escape.aiscript",
170+
"match": "\\\\['\"`\\\\{}]"
171+
},
168172
{
169173
"name": "meta.string-template.aiscript",
170-
"begin": "{",
174+
"begin": "\\{",
171175
"beginCaptures": {
172176
"0": {
173177
"name": "entity.name.tag.aiscript"
174178
}
175179
},
176-
"end": "}",
180+
"end": "\\}",
177181
"endCaptures": {
178182
"0": {
179183
"name": "entity.name.tag.aiscript"
@@ -185,10 +189,6 @@
185189
}
186190
]
187191
},
188-
{
189-
"name": "constant.character.escape.aiscript",
190-
"match": "\\\\."
191-
},
192192
{
193193
"name": "string.other.aiscript",
194194
"match": "[^`{]+"

0 commit comments

Comments
 (0)