Skip to content

Add support for tagged html template strings #5

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
Benvie merged 1 commit into from
Jul 16, 2018
Merged

Add support for tagged html template strings #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions JavaScriptNext.YAML-tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ repository:

- include: '#literal-regexp' # before operators to avoid ambiguities
- include: '#literal-number'
- include: '#literal-tagged-html'
- include: '#literal-template-string'
- include: '#literal-string'
- include: '#literal-language-constant'
Expand Down Expand Up @@ -985,6 +986,19 @@ repository:
patterns:
- include: '#expression'

literal-tagged-html:
patterns:
- contentName: text.html.basic.embedded.js
begin: '(html)(`)'
beginCaptures:
'1': {name: meta.function-call.tagged-template.js}
'2': {name: punctuation.definition.string.template.begin.js}
end: '`'
endCaptures:
'0': {name: punctuation.definition.string.template.end.js}
patterns:
- include: 'text.html.basic'

literal-regexp:
patterns:
# ignore ++, -- since they're uncommon, distinguishing them is not possible in sublime text, see:
Expand Down
192 changes: 119 additions & 73 deletions JavaScriptNext.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,10 @@
<key>include</key>
<string>#literal-number</string>
</dict>
<dict>
<key>include</key>
<string>#literal-tagged-html</string>
</dict>
<dict>
<key>include</key>
<string>#literal-template-string</string>
Expand Down Expand Up @@ -2244,79 +2248,6 @@
</dict>
</array>
</dict>
<key>literal-template-string</key>
<dict>
<key>patterns</key>
<array>
<dict>
<key>begin</key>
<string>([a-zA-Z$_][\w$_]*)?(`)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>entity.template-string.tag.name.js</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>punctuation.definition.template-string.begin.js</string>
</dict>
</dict>
<key>end</key>
<string>`</string>
<key>endCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.definition.template-string.end.js</string>
</dict>
</dict>
<key>name</key>
<string>string.template-string.js</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#string-content</string>
</dict>
<dict>
<key>begin</key>
<string>\${</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.template-string.element.begin.js</string>
</dict>
</dict>
<key>end</key>
<string>}</string>
<key>endCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.template-string.element.end.js</string>
</dict>
</dict>
<key>name</key>
<string>entity.template-string.element.js</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#expression</string>
</dict>
</array>
</dict>
</array>
</dict>
</array>
</dict>
<key>literal-regexp</key>
<dict>
<key>patterns</key>
Expand Down Expand Up @@ -2523,6 +2454,121 @@
</dict>
</array>
</dict>
<key>literal-tagged-html</key>
<dict>
<key>patterns</key>
<array>
<dict>
<key>begin</key>
<string>(html)(`)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>meta.function-call.tagged-template.js</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>punctuation.definition.string.template.begin.js</string>
</dict>
</dict>
<key>contentName</key>
<string>text.html.basic.embedded.js</string>
<key>end</key>
<string>`</string>
<key>endCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.definition.string.template.end.js</string>
</dict>
</dict>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>text.html.basic</string>
</dict>
</array>
</dict>
</array>
</dict>
<key>literal-template-string</key>
<dict>
<key>patterns</key>
<array>
<dict>
<key>begin</key>
<string>([a-zA-Z$_][\w$_]*)?(`)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>entity.template-string.tag.name.js</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>punctuation.definition.template-string.begin.js</string>
</dict>
</dict>
<key>end</key>
<string>`</string>
<key>endCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.definition.template-string.end.js</string>
</dict>
</dict>
<key>name</key>
<string>string.template-string.js</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#string-content</string>
</dict>
<dict>
<key>begin</key>
<string>\${</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.template-string.element.begin.js</string>
</dict>
</dict>
<key>end</key>
<string>}</string>
<key>endCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.template-string.element.end.js</string>
</dict>
</dict>
<key>name</key>
<string>entity.template-string.element.js</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#expression</string>
</dict>
</array>
</dict>
</array>
</dict>
</array>
</dict>
<key>literal-variable</key>
<dict>
<key>patterns</key>
Expand Down