microsoft
/
TypeScript-TmLanguage
зеркало из https://github.com/microsoft/TypeScript-TmLanguage.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Mark template expressions with meta.embedded.line tag 

**Problem**
VS Code themes currently hardcode a solution for reseting expression colorization inside of template string substitution expressions. This is not scalable since it js/ts specific

With https://github.com/Microsoft/vscode/issues/33120 I've proposed that VS Code themes reset styling inside of meta.embedded scopes to support this across multiple languages

**Fix**
Marks template substitution expressions with the additional `meta.embedded.line.ts` scope
This commit is contained in:
Matt Bierner 2017-09-06 13:23:50 -07:00
Родитель c1e19d3d4f
Коммит 1b4da07d0d
14 изменённых файлов: 83 добавлений и 78 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
TypeScript.YAML-tmLanguage
Просмотреть файл

@ -1952,6 +1952,7 @@ repository:
'0': { name: punctuation.definition.template-expression.end.ts }
patterns:
- include: '#expression'
contentName: meta.embedded.line.ts
literal:
patterns:

2
TypeScript.tmLanguage
Просмотреть файл

@ -5378,6 +5378,8 @@
<string>#expression</string>
</dict>
</array>
<key>contentName</key>
<string>meta.embedded.line.ts</string>
</dict>
<key>literal</key>
<dict>

2
TypeScriptReact.tmLanguage
Просмотреть файл

@ -5324,6 +5324,8 @@
<string>#expression</string>
</dict>
</array>
<key>contentName</key>
<string>meta.embedded.line.tsx</string>
</dict>
<key>literal</key>
<dict>

4
tests/baselines/Issue124.baseline.txt
Просмотреть файл

@ -151,13 +151,13 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^^^^^^^^^^^^^^^^^^^^
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts variable.other.constant.ts
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.constant.ts
^
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^^
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^^^^^^^^^^
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts variable.other.readwrite.ts
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^^^^^^^^^^^^^^^

12
tests/baselines/Issue230.baseline.txt
Просмотреть файл

@ -182,11 +182,11 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^^^^^
source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts string.template.ts meta.template.expression.ts variable.other.object.ts
source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.object.ts
^
source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts string.template.ts meta.template.expression.ts punctuation.accessor.ts
source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts punctuation.accessor.ts
^^^
source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts string.template.ts meta.template.expression.ts variable.other.property.ts
source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.property.ts
^
source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^
@ -194,11 +194,11 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^^^^^
source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts string.template.ts meta.template.expression.ts variable.other.object.ts
source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.object.ts
^
source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts string.template.ts meta.template.expression.ts punctuation.accessor.ts
source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts punctuation.accessor.ts
^^^^
source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts string.template.ts meta.template.expression.ts variable.other.property.ts
source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.property.ts
^
source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^

20
tests/baselines/Issue321.baseline.txt
Просмотреть файл

@ -785,7 +785,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^^^^^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts variable.other.readwrite.ts
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^^
@ -793,23 +793,23 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^^^^^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts variable.other.readwrite.ts
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts keyword.operator.arithmetic.ts
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts keyword.operator.arithmetic.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts
^^^^^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts variable.other.readwrite.ts
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts keyword.operator.arithmetic.ts
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts keyword.operator.arithmetic.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts constant.numeric.decimal.ts
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts constant.numeric.decimal.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^

54
tests/baselines/Issue343.baseline.txt
Просмотреть файл

@ -19,25 +19,25 @@ Grammar: TypeScript.tmLanguage
^^
source.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^^^^
source.ts string.template.ts meta.template.expression.ts meta.function-call.ts support.constant.math.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.function-call.ts support.constant.math.ts
^
source.ts string.template.ts meta.template.expression.ts meta.function-call.ts punctuation.accessor.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.function-call.ts punctuation.accessor.ts
^^^^^
source.ts string.template.ts meta.template.expression.ts meta.function-call.ts support.function.math.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.function-call.ts support.function.math.ts
^
source.ts string.template.ts meta.template.expression.ts meta.brace.round.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.brace.round.ts
^^^^^^^^^^^^
source.ts string.template.ts meta.template.expression.ts variable.other.readwrite.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.readwrite.ts
^
source.ts string.template.ts meta.template.expression.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts
^
source.ts string.template.ts meta.template.expression.ts keyword.operator.arithmetic.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts keyword.operator.arithmetic.ts
^
source.ts string.template.ts meta.template.expression.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts
^^^^^^^^
source.ts string.template.ts meta.template.expression.ts variable.other.readwrite.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.readwrite.ts
^
source.ts string.template.ts meta.template.expression.ts meta.brace.round.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.brace.round.ts
^
source.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^^^^^
@ -45,39 +45,39 @@ Grammar: TypeScript.tmLanguage
^^
source.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^^^^
source.ts string.template.ts meta.template.expression.ts meta.function-call.ts support.constant.math.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.function-call.ts support.constant.math.ts
^
source.ts string.template.ts meta.template.expression.ts meta.function-call.ts punctuation.accessor.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.function-call.ts punctuation.accessor.ts
^^^^^
source.ts string.template.ts meta.template.expression.ts meta.function-call.ts support.function.math.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.function-call.ts support.function.math.ts
^
source.ts string.template.ts meta.template.expression.ts meta.brace.round.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.brace.round.ts
^^^^^^^^
source.ts string.template.ts meta.template.expression.ts variable.other.readwrite.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.readwrite.ts
^
source.ts string.template.ts meta.template.expression.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts
^
source.ts string.template.ts meta.template.expression.ts keyword.operator.arithmetic.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts keyword.operator.arithmetic.ts
^
source.ts string.template.ts meta.template.expression.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts
^
source.ts string.template.ts meta.template.expression.ts meta.brace.round.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.brace.round.ts
^
source.ts string.template.ts meta.template.expression.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts
^^^^^^^^^^^^
source.ts string.template.ts meta.template.expression.ts variable.other.readwrite.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.readwrite.ts
^
source.ts string.template.ts meta.template.expression.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts
^
source.ts string.template.ts meta.template.expression.ts keyword.operator.arithmetic.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts keyword.operator.arithmetic.ts
^
source.ts string.template.ts meta.template.expression.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts
^^^
source.ts string.template.ts meta.template.expression.ts constant.numeric.decimal.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts constant.numeric.decimal.ts
^
source.ts string.template.ts meta.template.expression.ts meta.brace.round.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.brace.round.ts
^
source.ts string.template.ts meta.template.expression.ts meta.brace.round.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.brace.round.ts
^
source.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^^^^^

4
tests/baselines/Issue357.baseline.txt
Просмотреть файл

@ -310,7 +310,7 @@ Grammar: TypeScriptReact.tmLanguage
^^
source.tsx meta.var.expr.tsx meta.arrow.tsx meta.block.tsx meta.tag.tsx meta.jsx.children.tsx meta.tag.tsx meta.jsx.children.tsx meta.embedded.expression.tsx meta.tag.tsx meta.jsx.children.tsx meta.embedded.expression.tsx string.template.tsx meta.template.expression.tsx punctuation.definition.template-expression.begin.tsx
^^^^
source.tsx meta.var.expr.tsx meta.arrow.tsx meta.block.tsx meta.tag.tsx meta.jsx.children.tsx meta.tag.tsx meta.jsx.children.tsx meta.embedded.expression.tsx meta.tag.tsx meta.jsx.children.tsx meta.embedded.expression.tsx string.template.tsx meta.template.expression.tsx variable.other.readwrite.tsx
source.tsx meta.var.expr.tsx meta.arrow.tsx meta.block.tsx meta.tag.tsx meta.jsx.children.tsx meta.tag.tsx meta.jsx.children.tsx meta.embedded.expression.tsx meta.tag.tsx meta.jsx.children.tsx meta.embedded.expression.tsx string.template.tsx meta.template.expression.tsx meta.embedded.line.tsx variable.other.readwrite.tsx
^
source.tsx meta.var.expr.tsx meta.arrow.tsx meta.block.tsx meta.tag.tsx meta.jsx.children.tsx meta.tag.tsx meta.jsx.children.tsx meta.embedded.expression.tsx meta.tag.tsx meta.jsx.children.tsx meta.embedded.expression.tsx string.template.tsx meta.template.expression.tsx punctuation.definition.template-expression.end.tsx
^
@ -344,7 +344,7 @@ Grammar: TypeScriptReact.tmLanguage
^^
source.tsx meta.var.expr.tsx meta.arrow.tsx meta.block.tsx meta.tag.tsx meta.jsx.children.tsx meta.tag.tsx meta.jsx.children.tsx meta.embedded.expression.tsx meta.tag.tsx meta.jsx.children.tsx meta.embedded.expression.tsx string.template.tsx meta.template.expression.tsx punctuation.definition.template-expression.begin.tsx
^^^^
source.tsx meta.var.expr.tsx meta.arrow.tsx meta.block.tsx meta.tag.tsx meta.jsx.children.tsx meta.tag.tsx meta.jsx.children.tsx meta.embedded.expression.tsx meta.tag.tsx meta.jsx.children.tsx meta.embedded.expression.tsx string.template.tsx meta.template.expression.tsx variable.other.readwrite.tsx
source.tsx meta.var.expr.tsx meta.arrow.tsx meta.block.tsx meta.tag.tsx meta.jsx.children.tsx meta.tag.tsx meta.jsx.children.tsx meta.embedded.expression.tsx meta.tag.tsx meta.jsx.children.tsx meta.embedded.expression.tsx string.template.tsx meta.template.expression.tsx meta.embedded.line.tsx variable.other.readwrite.tsx
^
source.tsx meta.var.expr.tsx meta.arrow.tsx meta.block.tsx meta.tag.tsx meta.jsx.children.tsx meta.tag.tsx meta.jsx.children.tsx meta.embedded.expression.tsx meta.tag.tsx meta.jsx.children.tsx meta.embedded.expression.tsx string.template.tsx meta.template.expression.tsx punctuation.definition.template-expression.end.tsx
^

2
tests/baselines/Issue359.baseline.txt
Просмотреть файл

@ -97,7 +97,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.var.expr.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts meta.array.literal.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^^^^^
source.ts meta.var.expr.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts meta.array.literal.ts string.template.ts meta.template.expression.ts variable.other.readwrite.ts
source.ts meta.var.expr.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts meta.array.literal.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts meta.array.literal.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^^

4
tests/baselines/Issue368.baseline.txt
Просмотреть файл

@ -74,7 +74,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^^^^^^^^^^
source.ts string.template.ts meta.template.expression.ts variable.other.readwrite.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.readwrite.ts
^
source.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^
@ -101,7 +101,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^^^^^^^^^^^
source.ts string.template.ts meta.template.expression.ts variable.other.constant.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.constant.ts
^
source.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^

6
tests/baselines/Issue380.baseline.txt
Просмотреть файл

@ -33,11 +33,11 @@ Grammar: TypeScript.tmLanguage
^^
source.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^
source.ts string.template.ts meta.template.expression.ts string.quoted.double.ts punctuation.definition.string.begin.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts string.quoted.double.ts punctuation.definition.string.begin.ts
^
source.ts string.template.ts meta.template.expression.ts string.quoted.double.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts string.quoted.double.ts
^
source.ts string.template.ts meta.template.expression.ts string.quoted.double.ts punctuation.definition.string.end.ts
source.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts string.quoted.double.ts punctuation.definition.string.end.ts
^
source.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^

12
tests/baselines/Issue381.baseline.txt
Просмотреть файл

@ -76,7 +76,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^^^^^^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.template.ts meta.template.expression.ts variable.other.readwrite.ts
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -84,7 +84,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^^^^^^^^^^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.template.ts meta.template.expression.ts variable.other.readwrite.ts
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^^^^^^^^^^^^^^
@ -92,13 +92,13 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.template.ts meta.template.expression.ts keyword.operator.arithmetic.ts
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts keyword.operator.arithmetic.ts
^^^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.template.ts meta.template.expression.ts new.expr.ts keyword.operator.new.ts
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts new.expr.ts keyword.operator.new.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.template.ts meta.template.expression.ts new.expr.ts
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts new.expr.ts
^^^^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.template.ts meta.template.expression.ts new.expr.ts entity.name.type.ts
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts new.expr.ts entity.name.type.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^

32
tests/baselines/Issue402.baseline.txt
Просмотреть файл

@ -232,19 +232,19 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^^^^^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.function-call.ts support.variable.dom.ts
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.function-call.ts support.variable.dom.ts
^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.function-call.ts punctuation.accessor.ts
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.function-call.ts punctuation.accessor.ts
^^^^^^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.function-call.ts variable.other.object.property.ts
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.function-call.ts variable.other.object.property.ts
^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.function-call.ts punctuation.accessor.ts
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.function-call.ts punctuation.accessor.ts
^^^^^^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.function-call.ts entity.name.function.ts
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.function-call.ts entity.name.function.ts
^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.brace.round.ts
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.brace.round.ts
^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.brace.round.ts
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.brace.round.ts
^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^^^^^^^^^^^^^^
@ -252,7 +252,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^^^^^^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts variable.other.readwrite.ts
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.readwrite.ts
^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^^^^^^^^^^^^^^^
@ -528,19 +528,19 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^^^^^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.function-call.ts support.variable.dom.ts
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.function-call.ts support.variable.dom.ts
^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.function-call.ts punctuation.accessor.ts
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.function-call.ts punctuation.accessor.ts
^^^^^^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.function-call.ts variable.other.object.property.ts
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.function-call.ts variable.other.object.property.ts
^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.function-call.ts punctuation.accessor.ts
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.function-call.ts punctuation.accessor.ts
^^^^^^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.function-call.ts entity.name.function.ts
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.function-call.ts entity.name.function.ts
^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.brace.round.ts
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.brace.round.ts
^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.brace.round.ts
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts meta.brace.round.ts
^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^^^^^^^^^^^^^^
@ -548,7 +548,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^^^^^^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts variable.other.readwrite.ts
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts variable.other.readwrite.ts
^
source.ts meta.function.expression.ts meta.block.ts meta.block.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^^^^^^^^^^^^^^^

6
tests/baselines/Issue471.baseline.txt
Просмотреть файл

@ -38,11 +38,11 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
^
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts string.quoted.single.ts punctuation.definition.string.begin.ts
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts string.quoted.single.ts punctuation.definition.string.begin.ts
^^^^^
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts string.quoted.single.ts
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts string.quoted.single.ts
^
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts string.quoted.single.ts punctuation.definition.string.end.ts
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts meta.embedded.line.ts string.quoted.single.ts punctuation.definition.string.end.ts
^
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
^^^^