Skip to content

Add Ngx v19 and v20 language features #37

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
princemaple merged 4 commits into from
Jun 4, 2025
Merged

Add Ngx v19 and v20 language features #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f471bee
Add support for typeof and void operators
deathaxe Jun 4, 2025
34e4ccd
Add support for exponentiation operator
deathaxe Jun 4, 2025
2924628
Add support for in operator
deathaxe Jun 4, 2025
d24ce17
Add support for template strings
deathaxe Jun 4, 2025
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 Embeddings/RegExp (for Ngx Template Strings).sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
%YAML 1.2
---
scope: source.regexp.embedded.ngx.template-string
version: 2
hidden: true

extends: Packages/Regular Expressions/RegExp (Basic).sublime-syntax

contexts:

prototype:
- match: (?=/?`)
pop: 1
- include: NgxHTML.sublime-syntax#ng-template-text-interpolations
93 changes: 92 additions & 1 deletion NgxHTML.sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,7 @@ contexts:
- include: ng-constants
- include: ng-numbers
- include: ng-strings
- include: ng-templates
- include: ng-variables

###[ ANGULAR ARRAYS ]##########################################################
Expand Down Expand Up @@ -553,7 +554,7 @@ contexts:
scope: punctuation.terminator.expression.ngx
- match: '[!=]==?|[<>]=?'
scope: keyword.operator.comparison.ngx
- match: '[-+*/%]'
- match: '\*\*|[-+*/%]'
scope: keyword.operator.arithmetic.ngx
- match: '&&|\|\||!'
scope: keyword.operator.logical.ngx
Expand All @@ -564,6 +565,10 @@ contexts:
- match: \?(?!\.)
scope: keyword.operator.ternary.ngx
push: ng-ternary-expression
- match: in{{ident_break}}
scope: keyword.operator.comparison.ngx
- match: (?:typeof|void){{ident_break}}
scope: keyword.operator.type.ngx

ng-ternary-expression:
- match: ':'
Expand Down Expand Up @@ -665,6 +670,92 @@ contexts:
- match: \\.
scope: constant.character.escape.ngx

ng-templates:
# tagged template strings
- match: ({{ident_name}})(\`)
captures:
1: variable.function.tagged-template.ngx
2: meta.string.template.ngx string.quoted.other.ngx punctuation.definition.string.begin.ngx
push: ng-tagged-template-plain-body
# untagged plain or regexp template strings
- match: \`
scope: string.quoted.other.ngx punctuation.definition.string.begin.ngx
branch_point: template-string
branch:
- ng-template-pattern-begin
- ng-template-plain-body

ng-tagged-template-plain-body:
- meta_content_scope: meta.string.template.ngx string.quoted.other.ngx
- include: ng-tagged-template-plain-end
- include: ng-template-string-interpolations
- include: ng-string-content

ng-tagged-template-plain-end:
- match: \`
scope: meta.string.template.ngx string.quoted.other.ngx punctuation.definition.string.end.ngx
pop: 1
- match: \n
scope: invalid.illegal.newline.ngx
pop: 1

ng-template-pattern-begin:
- meta_scope: meta.string.template.regexp.ngx
- match: /
scope: punctuation.definition.pattern.begin.ngx
push: ng-template-pattern-body
- match: ''
fail: template-string

ng-template-pattern-body:
- match: (/)(\`)
captures:
1: punctuation.definition.pattern.end.ngx
2: string.quoted.other.ngx punctuation.definition.string.end.ngx
pop: 2
- match: (?=\`)
fail: template-string
- match: \n
scope: invalid.illegal.newline.ngx
pop: 2
- include: scope:source.regexp.embedded.ngx.template-string
apply_prototype: true

ng-template-plain-body:
- meta_scope: meta.string.template.ngx
- meta_content_scope: string.quoted.other.ngx
- match: \`
scope: string.quoted.other.ngx punctuation.definition.string.end.ngx
pop: 1
- match: \n
scope: invalid.illegal.newline.ngx
pop: 1
- include: ng-template-string-interpolations
- include: ng-string-content

ng-template-string-interpolations:
- match: \$\{
scope: punctuation.section.interpolation.begin.ngx
push: ng-template-string-interpolation-body

ng-template-string-interpolation-body:
- clear_scopes: 1
- meta_scope: meta.interpolation.ngx
- include: ng-template-text-interpolation-body

ng-template-text-interpolations:
# used by embedded syntaxes (e.g.: CSS or HTML)
- match: \$\{
scope: punctuation.section.interpolation.begin.ngx
push: ng-template-text-interpolation-body

ng-template-text-interpolation-body:
- meta_scope: meta.interpolation.ngx
- match: \}
scope: punctuation.section.interpolation.end.ngx
pop: 1
- include: ng-expressions

###[ ANGULAR VARIABLES ]#######################################################

ng-variables:
Expand Down
103 changes: 102 additions & 1 deletion tests/syntax_test_scopes.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,88 @@
<!-- ^ punctuation.definition.string.begin.ngx -->
<!-- ^ punctuation.definition.string.end.ngx -->

<!-- template strings -->
{{ `Hello ${name + `template ${var}`}` }}
<!-- ^^^^^^^ meta.string.template.ngx - meta.interpolation -->
<!-- ^^^^^^^^^ meta.string.template.ngx meta.interpolation.ngx - meta.string meta.string -->
<!-- ^^^^^^^^^^ meta.string.template.ngx meta.interpolation.ngx meta.string.template.ngx - meta.interpolation meta.interpolation -->
<!-- ^^^^^^ meta.string.template.ngx meta.interpolation.ngx meta.string.template.ngx meta.interpolation.ngx -->
<!-- ^ meta.string.template.ngx meta.interpolation.ngx meta.string.template.ngx - meta.interpolation meta.interpolation -->
<!-- ^ meta.string.template.ngx meta.interpolation.ngx - meta.string meta.string -->
<!-- ^ meta.string.template.ngx - meta.interpolation -->
<!-- ^^^^^^^ string.quoted.other.ngx -->
<!-- ^^^^^^^^^ - string -->
<!-- ^ punctuation.definition.string.begin.ngx -->
<!-- ^^ punctuation.section.interpolation.begin.ngx -->
<!-- ^^^^ variable.other.readwrite.ngx -->
<!-- ^ keyword.operator.arithmetic.ngx -->
<!-- ^^^^^^^^^^ string.quoted.other.ngx -->
<!-- ^ punctuation.definition.string.begin.ngx -->
<!-- ^^^^^^ - string -->
<!-- ^^ punctuation.section.interpolation.begin.ngx -->
<!-- ^^^ variable.other.readwrite.ngx -->
<!-- ^ punctuation.section.interpolation.end.ngx -->
<!-- ^ string.quoted.other.ngx punctuation.definition.string.end.ngx -->
<!-- ^ punctuation.section.interpolation.end.ngx - string -->
<!-- ^ string.quoted.other.ngx punctuation.definition.string.end.ngx -->

<!-- tagged template strings -->
{{ tag`Text \`${var}\`` }}
<!-- ^^^ variable.function.tagged-template.ngx - string -->
<!-- ^^^^^^^^^^^^^^^^^ meta.string.template.ngx -->
<!-- ^^^^^^^^ string.quoted.other.ngx -->
<!-- ^ punctuation.definition.string.begin.ngx -->
<!-- ^^ constant.character.escape.ngx -->
<!-- ^^^^^^ meta.interpolation.ngx - string -->
<!-- ^^ punctuation.section.interpolation.begin.ngx -->
<!-- ^^^ variable.other.readwrite.ngx -->
<!-- ^ punctuation.section.interpolation.end.ngx -->
<!-- ^^^ string.quoted.other.ngx -->
<!-- ^^ constant.character.escape.ngx -->
<!-- ^ punctuation.definition.string.end.ngx -->

<!-- regular expressions -->
{{ `/^[a-z]${var + `nest\`ed ${ `/\w+/` + pattern}`}\d+/` }}
<!-- ^^^^^^^^ meta.string.template.regexp.ngx - meta.interpolation -->
<!-- ^^^^^^^^ meta.string.template.regexp.ngx meta.interpolation.ngx - meta.string meta.strin -->
<!-- ^^^^^^^^^^ meta.string.template.regexp.ngx meta.interpolation.ngx meta.string.template.ngx - meta.interpolation meta.interpolation -->
<!-- ^^^ meta.string.template.regexp.ngx meta.interpolation.ngx meta.string.template.ngx meta.interpolation.ngx -->
<!-- ^^^^^^^ meta.string.template.regexp.ngx meta.interpolation.ngx meta.string.template.ngx meta.interpolation.ngx meta.string.template.regexp.ngx -->
<!-- ^^^^^^^^^^^ meta.string.template.regexp.ngx meta.interpolation.ngx meta.string.template.ngx meta.interpolation.ngx -->
<!-- ^ meta.string.template.regexp.ngx meta.interpolation.ngx meta.string.template.ngx - meta.interpolation meta.interpolation -->
<!-- ^ meta.string.template.regexp.ngx meta.interpolation.ngx - meta.string meta.strin -->
<!-- ^^^^^ meta.string.template.regexp.ngx - meta.interpolation -->
<!-- ^ string.quoted.other.ngx punctuation.definition.string.begin.ngx -->
<!-- ^ punctuation.definition.pattern.begin.ngx -->
<!-- ^ keyword.control.anchor.regexp -->
<!-- ^^^^^ meta.set.regexp -->
<!-- ^ punctuation.definition.set.begin.regexp -->
<!-- ^^^ constant.other.range.regexp -->
<!-- ^ punctuation.separator.sequence.regexp -->
<!-- ^ punctuation.definition.set.end.regexp -->
<!-- ^^ punctuation.section.interpolation.begin.ngx -->
<!-- ^^^ variable.other.readwrite.ngx -->
<!-- ^ keyword.operator.arithmetic.ngx -->
<!-- ^^^^^^^^^^ string.quoted.other.ngx -->
<!-- ^ punctuation.definition.string.begin.ngx -->
<!-- ^^ constant.character.escape.ngx -->
<!-- ^^ punctuation.section.interpolation.begin.ngx -->
<!-- ^ string.quoted.other.ngx punctuation.definition.string.begin.ngx -->
<!-- ^ punctuation.definition.pattern.begin.ngx -->
<!-- ^^ keyword.control.character-class.regexp -->
<!-- ^ keyword.operator.quantifier.regexp -->
<!-- ^ punctuation.definition.pattern.end.ngx -->
<!-- ^ string.quoted.other.ngx punctuation.definition.string.end.ngx -->
<!-- ^ keyword.operator.arithmetic.ngx -->
<!-- ^^^^^^^ variable.other.readwrite.ngx -->
<!-- ^ punctuation.section.interpolation.end.ngx -->
<!-- ^ string.quoted.other.ngx punctuation.definition.string.end.ngx -->
<!-- ^ punctuation.section.interpolation.end.ngx -->
<!-- ^^ keyword.control.character-class.regexp -->
<!-- ^ keyword.operator.quantifier.regexp -->
<!-- ^ punctuation.definition.pattern.end.ngx -->
<!-- ^ string.quoted.other.ngx punctuation.definition.string.end.ngx -->

<!-- escaped chars -->
{{ "\xAF \u2AFF \n \"" }}
<!--^^^^^^^^^^^^^^^^^^^^^^^ meta.embedded.expression.ngx.html -->
Expand Down Expand Up @@ -611,7 +693,7 @@
https://angular.dev/guide/templates/expression-syntax#what-operators-are-supported
-->

{{ - + * / % === !== == != = < <= >= > && || ! ?? }}
{{ - + * / % === !== == != = < <= >= > && || ! ?? ** }}
<!-- ^ keyword.operator.arithmetic.ngx -->
<!-- ^ keyword.operator.arithmetic.ngx -->
<!-- ^ keyword.operator.arithmetic.ngx -->
Expand All @@ -630,6 +712,7 @@
<!-- ^^ keyword.operator.logical.ngx -->
<!-- ^ keyword.operator.logical.ngx -->
<!-- ^^ keyword.operator.null-coalescing.ngx -->
<!-- ^^ keyword.operator.arithmetic.ngx -->

<!-- ternary -->
{{ foo ? bar : baz }}
Expand All @@ -655,6 +738,24 @@
<!-- ^ punctuation.definition.string.end.ngx -->
<!-- ^^ punctuation.section.embedded.end.ngx.html -->

{{ "model" in cars }}
<!-- ^^^^^^^ meta.string.ngx string.quoted.double.ngx -->
<!-- ^^ keyword.operator.comparison.ngx -->
<!-- ^^^^ variable.other.readwrite.ngx -->

{{ type = typeof 32 }}
<!-- ^^^^ variable.other.readwrite.ngx -->
<!-- ^ keyword.operator.assignment.ngx -->
<!-- ^^^^^^ keyword.operator.type.ngx -->
<!-- ^^ meta.number.integer.decimal.ngx constant.numeric.value.ngx -->


{{ type = void 32 }}
<!-- ^^^^ variable.other.readwrite.ngx -->
<!-- ^ keyword.operator.assignment.ngx -->
<!-- ^^^^ keyword.operator.type.ngx -->
<!-- ^^ meta.number.integer.decimal.ngx constant.numeric.value.ngx -->

<!-- property subscription -->
{{ person['name'][0] = "Mirabel" }}
<!--^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.embedded.expression.ngx.html -->
Expand Down