Skip to content
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

Use JSX as default script language #33

Merged
merged 1 commit into from
Nov 22, 2024
Merged

Use JSX as default script language #33

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
40 changes: 3 additions & 37 deletions Vue Component.sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,6 @@ contexts:
- script-coffeescript
- tag-lang-attribute-meta
- tag-generic-attribute-value
- match: (?i)(?=jsx{{unquoted_attribute_break}}|'jsx'|"jsx")
set:
- script-jsx
- tag-lang-attribute-meta
- tag-generic-attribute-value
- match: (?i)(?=livescript{{unquoted_attribute_break}}|'livescript'|"livescript")
set:
- script-livescript
Expand Down Expand Up @@ -200,39 +195,10 @@ contexts:
3: source.coffee.embedded.html
4: comment.block.html punctuation.definition.comment.end.html

script-javascript:
# required until ST4113
- meta_scope: meta.tag.script.begin.html
- match: '>'
scope: punctuation.definition.tag.end.html
set: script-javascript-content
- include: script-common

script-javascript-content:
# required until ST4113
- meta_include_prototype: false
- match: '{{script_content_begin}}'
captures:
1: comment.block.html punctuation.definition.comment.begin.html
pop: 1 # make sure to match only once
embed: scope:source.js
embed_scope: source.js.embedded.html
escape: '{{script_content_end}}'
escape_captures:
1: source.js.embedded.html
2: comment.block.html punctuation.definition.comment.end.html
3: source.js.embedded.html
4: comment.block.html punctuation.definition.comment.end.html

script-jsx:
- meta_include_prototype: false
- meta_scope: meta.tag.script.begin.html
- match: '>'
scope: punctuation.definition.tag.end.html
set: script-jsx-content
- include: script-common

script-jsx-content:
# Note: Augment default JavaScript by JSX
# as Vue supports writing components via JSX tags by default
# and JSX highlights/scopes plain JavaScript without issues.
- meta_include_prototype: false
- match: '{{script_content_begin}}'
captures:
Expand Down
50 changes: 37 additions & 13 deletions tests/syntax_test_script.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,62 @@

<script> var i = 0; </script>
// ^^^^^^^^ meta.tag - source
// ^^^^^^^^^^^^ source.js.embedded.html - meta.tag
// ^^^^^^^^^^^^ source.jsx.embedded.html - meta.tag
// ^^^^^^^^^ meta.tag - source

<script> var i = 0; --> </script>
// ^^^^^^^^ meta.tag - source
// ^^^^^^^^^^^^ source.js.embedded.html - meta.tag
// ^^^^^^^^^^^^ source.jsx.embedded.html - meta.tag
// ^^^^ - meta.tag - source
// ^^^ comment.block.html punctuation.definition.comment.end.html
// ^^^^^^^^^ meta.tag - source

<script> <!-- var i = 0; </script>
// ^^^^^^^^ meta.tag - source
// ^^^^^ - meta.tag - source
// ^^^^^^^^^^^^ source.js.embedded.html - meta.tag
// ^^^^^^^^^^^^ source.jsx.embedded.html - meta.tag
// ^^^^^^^^^ meta.tag - source
// ^^^^ punctuation.definition.comment.begin.html

<script> <!-- var i = 0; --> </script>
// ^^^^^^^^ meta.tag - source
// ^^^^^ - meta.tag - source
// ^^^^ punctuation.definition.comment.begin.html
// ^^^^^^^^^^^^ source.js.embedded.html - meta.tag
// ^^^^^^^^^^^^ source.jsx.embedded.html - meta.tag
// ^^^^ - meta.tag - source
// ^^^ comment.block.html punctuation.definition.comment.end.html
// ^^^^^^^^^ meta.tag - source


<script>

// <- source.js.embedded.html
// <- source.jsx.embedded.html
var i = 0;
// ^^^^^^^^^^^^ source.js.embedded.html - source source
// ^^^^^^^^^^^^ source.jsx.embedded.html - source source
export default {
render () {
return <div>{ this.foo }</div>
//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.jsx.embedded.html
// ^^^^^^ keyword.control.flow.return.js
// ^^^^^^^^^^^^^^^^^^^^^^^ meta.jsx.js
// ^^^^^ meta.tag
// ^ punctuation.definition.tag.begin.js
// ^^^ entity.name.tag
// ^ punctuation.definition.tag.end.js
// ^^^^^^^^^^^^ meta.interpolation.js
// ^ punctuation.definition.interpolation.begin.js
// ^^^^^^^^^^ source.js.embedded.jsx
// ^ punctuation.definition.interpolation.end.js
// ^^^^^^ meta.tag
// ^^ punctuation.definition.tag.begin.js
// ^^^ entity.name.tag
// ^ punctuation.definition.tag.end.js
}
//^^^^^^ source.jsx.embedded.html
// ^ punctuation.section
}
//^^^^ source.jsx.embedded.html
// ^ punctuation.section
</script>
// ^^^^^^^^^ meta.tag - source

Expand All @@ -46,7 +70,7 @@
//^^^^^^ - meta.tag - source
// ^^^^ comment.block.html punctuation.definition.comment.begin.html
var i = 0;
// ^^^^^^^^^^^^ source.js.embedded.html - source source - meta.tag
// ^^^^^^^^^^^^ source.jsx.embedded.html - source source - meta.tag
-->
// ^^^ comment.block.html punctuation.definition.comment.end.html - source
// ^ - comment - source
Expand All @@ -66,10 +90,10 @@
// ^^^^ comment.block.html punctuation.definition.comment.begin.html

var foo = 100;
// <- source.js.embedded.html - source source
// <- source.jsx.embedded.html - source source

(a --> b);
// ^^^ source.js.embedded.html keyword.operator - comment
// ^^^ source.jsx.embedded.html keyword.operator - comment

--> </script>
// ^^^ comment.block.html punctuation.definition.comment.end.html - source
Expand All @@ -92,10 +116,10 @@
// ^^^^ comment.block.html punctuation.definition.comment.begin.html

var foo = 100;
// <- source.js.embedded.html - source source
// <- source.jsx.embedded.html - source source

(a --> b);
// ^^^ source.js.embedded.html keyword.operator - comment
// ^^^ source.jsx.embedded.html keyword.operator - comment

--> </script>
// ^^^ comment.block.html punctuation.definition.comment.end.html - source
Expand All @@ -113,8 +137,8 @@
application/jAvAsCrIpT>
// ^^^^^^^^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value - meta.attribute-with-value meta.attribute-with-value
var foo = 100;
// <- source.js.embedded.html - source source
// ^^^^^^^^^^^^^^^^ source.js.embedded.html - source source
// <- source.jsx.embedded.html - source source
// ^^^^^^^^^^^^^^^^ source.jsx.embedded.html - source source
</script>
// ^^^^^^^^^ meta.tag - source

Expand Down