Skip to content

Commit caff692

Browse files
authored
refactor: rename template syntax to inline_template (#506)
* refactor: rename template syntax to inline_template This commit performs a minor refactor, changing the TextMate inline template syntax file name and scopes to explicitly be `inline_template`. This is in preparation for adding a TextMate grammar for CSS styles in `@Component` `styles` properties. * fixup! refactor: rename template syntax to inline_template * fixup! refactor: rename template syntax to inline_template
1 parent 6c7a683 commit caff692

File tree

5 files changed

+80
-80
lines changed

5 files changed

+80
-80
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
},
5151
"grammars": [
5252
{
53-
"path": "./syntaxes/template.ng.json",
54-
"scopeName": "template.ng",
53+
"path": "./syntaxes/inline-template.json",
54+
"scopeName": "inline-template.ng",
5555
"injectTo": [
5656
"source.ts"
5757
],

scripts/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ cp client/package.json client/yarn.lock dist/client
1919
cp server/package.json server/yarn.lock server/README.md dist/server
2020
# Copy files to syntaxes directory
2121
mkdir dist/syntaxes
22-
cp syntaxes/template.ng.json dist/syntaxes
22+
cp syntaxes/*.json dist/syntaxes
2323

2424
pushd dist
2525
yarn install --production --ignore-scripts

scripts/syntax.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ set -ex -o pipefail
99

1010
DUMMY_GRAMMARS=$(find syntaxes/test -name '*-dummy.json' -exec echo "-g {}" \; | tr '\n' ' ')
1111
ARGS=$(cat<<ARGS
12-
-s template.ng
13-
-g syntaxes/template.ng.json $DUMMY_GRAMMARS
12+
-s inline-template.ng
13+
-g syntaxes/inline-template.json $DUMMY_GRAMMARS
1414
-t syntaxes/test/**/*.ts
1515
ARGS
1616
)

syntaxes/template.ng.json renamed to syntaxes/inline-template.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"scopeName": "template.ng",
2+
"scopeName": "inline-template.ng",
33
"injectionSelector": "L:meta.decorator.ts -comment",
44
"patterns": [
55
{
6-
"include": "#ts-decorator"
6+
"include": "#inline-template"
77
}
88
],
99
"repository": {
10-
"ts-decorator": {
10+
"inline-template": {
1111
"begin": "(template)\\s*(:)",
1212
"beginCaptures": {
1313
"1": {

syntaxes/test/inline_template.ts.snap

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,98 @@
11
>// SYNTAX TEST "template.ng"
2-
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ template.ng
2+
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-template.ng
33
>/* clang-format off */
4-
#^^^^^^^^^^^^^^^^^^^^^^^ template.ng
4+
#^^^^^^^^^^^^^^^^^^^^^^^ inline-template.ng
55
>
66
>@Component({
7-
#^^^^^^^^^^^^^ template.ng
7+
#^^^^^^^^^^^^^ inline-template.ng
88
>//// Property key/value test
9-
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ template.ng
9+
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-template.ng
1010
> template: '<div></div>',
11-
#^^ template.ng
12-
# ^^^^^^^^ template.ng meta.object-literal.key.ts
13-
# ^ template.ng meta.object-literal.key.ts punctuation.separator.key-value.ts
14-
# ^ template.ng
15-
# ^ template.ng string
16-
# ^^^^^^^^^^^ template.ng
17-
# ^ template.ng string
18-
# ^^ template.ng
11+
#^^ inline-template.ng
12+
# ^^^^^^^^ inline-template.ng meta.object-literal.key.ts
13+
# ^ inline-template.ng meta.object-literal.key.ts punctuation.separator.key-value.ts
14+
# ^ inline-template.ng
15+
# ^ inline-template.ng string
16+
# ^^^^^^^^^^^ inline-template.ng
17+
# ^ inline-template.ng string
18+
# ^^ inline-template.ng
1919
>
2020
>//// String delimiter tests
21-
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^ template.ng
21+
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-template.ng
2222
> template: `<div></div>`,
23-
#^^ template.ng
24-
# ^^^^^^^^ template.ng meta.object-literal.key.ts
25-
# ^ template.ng meta.object-literal.key.ts punctuation.separator.key-value.ts
26-
# ^ template.ng
27-
# ^ template.ng string
28-
# ^^^^^^^^^^^ template.ng
29-
# ^ template.ng string
30-
# ^^ template.ng
23+
#^^ inline-template.ng
24+
# ^^^^^^^^ inline-template.ng meta.object-literal.key.ts
25+
# ^ inline-template.ng meta.object-literal.key.ts punctuation.separator.key-value.ts
26+
# ^ inline-template.ng
27+
# ^ inline-template.ng string
28+
# ^^^^^^^^^^^ inline-template.ng
29+
# ^ inline-template.ng string
30+
# ^^ inline-template.ng
3131
> template: "<div></div>",
32-
#^^ template.ng
33-
# ^^^^^^^^ template.ng meta.object-literal.key.ts
34-
# ^ template.ng meta.object-literal.key.ts punctuation.separator.key-value.ts
35-
# ^ template.ng
36-
# ^ template.ng string
37-
# ^^^^^^^^^^^ template.ng
38-
# ^ template.ng string
39-
# ^^ template.ng
32+
#^^ inline-template.ng
33+
# ^^^^^^^^ inline-template.ng meta.object-literal.key.ts
34+
# ^ inline-template.ng meta.object-literal.key.ts punctuation.separator.key-value.ts
35+
# ^ inline-template.ng
36+
# ^ inline-template.ng string
37+
# ^^^^^^^^^^^ inline-template.ng
38+
# ^ inline-template.ng string
39+
# ^^ inline-template.ng
4040
> template: '<div></div>',
41-
#^^ template.ng
42-
# ^^^^^^^^ template.ng meta.object-literal.key.ts
43-
# ^ template.ng meta.object-literal.key.ts punctuation.separator.key-value.ts
44-
# ^ template.ng
45-
# ^ template.ng string
46-
# ^^^^^^^^^^^ template.ng
47-
# ^ template.ng string
48-
# ^^ template.ng
41+
#^^ inline-template.ng
42+
# ^^^^^^^^ inline-template.ng meta.object-literal.key.ts
43+
# ^ inline-template.ng meta.object-literal.key.ts punctuation.separator.key-value.ts
44+
# ^ inline-template.ng
45+
# ^ inline-template.ng string
46+
# ^^^^^^^^^^^ inline-template.ng
47+
# ^ inline-template.ng string
48+
# ^^ inline-template.ng
4949
>
5050
>//// Parenthesization tests
51-
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^ template.ng
51+
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-template.ng
5252
> template: ( (( '<div></div>' )) ),
53-
#^^ template.ng
54-
# ^^^^^^^^ template.ng meta.object-literal.key.ts
55-
# ^ template.ng meta.object-literal.key.ts punctuation.separator.key-value.ts
56-
# ^ template.ng
57-
# ^ template.ng meta.brace.round.ts
58-
# ^ template.ng
59-
# ^ template.ng meta.brace.round.ts
60-
# ^ template.ng meta.brace.round.ts
61-
# ^ template.ng
62-
# ^ template.ng string
63-
# ^^^^^^^^^^^ template.ng
64-
# ^ template.ng string
65-
# ^ template.ng
66-
# ^ template.ng meta.brace.round.ts
67-
# ^ template.ng meta.brace.round.ts
68-
# ^ template.ng
69-
# ^ template.ng meta.brace.round.ts
70-
# ^^ template.ng
53+
#^^ inline-template.ng
54+
# ^^^^^^^^ inline-template.ng meta.object-literal.key.ts
55+
# ^ inline-template.ng meta.object-literal.key.ts punctuation.separator.key-value.ts
56+
# ^ inline-template.ng
57+
# ^ inline-template.ng meta.brace.round.ts
58+
# ^ inline-template.ng
59+
# ^ inline-template.ng meta.brace.round.ts
60+
# ^ inline-template.ng meta.brace.round.ts
61+
# ^ inline-template.ng
62+
# ^ inline-template.ng string
63+
# ^^^^^^^^^^^ inline-template.ng
64+
# ^ inline-template.ng string
65+
# ^ inline-template.ng
66+
# ^ inline-template.ng meta.brace.round.ts
67+
# ^ inline-template.ng meta.brace.round.ts
68+
# ^ inline-template.ng
69+
# ^ inline-template.ng meta.brace.round.ts
70+
# ^^ inline-template.ng
7171
>
7272
>//// Comments tests
73-
#^^^^^^^^^^^^^^^^^^^^ template.ng
73+
#^^^^^^^^^^^^^^^^^^^^ inline-template.ng
7474
> // template: '<div></div>'
75-
#^^^^^ template.ng
76-
# ^^^^^^^^ template.ng meta.object-literal.key.ts
77-
# ^ template.ng meta.object-literal.key.ts punctuation.separator.key-value.ts
78-
# ^ template.ng
79-
# ^ template.ng string
80-
# ^^^^^^^^^^^ template.ng
81-
# ^ template.ng string
75+
#^^^^^ inline-template.ng
76+
# ^^^^^^^^ inline-template.ng meta.object-literal.key.ts
77+
# ^ inline-template.ng meta.object-literal.key.ts punctuation.separator.key-value.ts
78+
# ^ inline-template.ng
79+
# ^ inline-template.ng string
80+
# ^^^^^^^^^^^ inline-template.ng
81+
# ^ inline-template.ng string
8282
> /*
83-
#^^^^^ template.ng
83+
#^^^^^ inline-template.ng
8484
> * template: '<div></div>'
85-
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ template.ng
85+
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-template.ng
8686
> */
87-
#^^^^^^ template.ng
87+
#^^^^^^ inline-template.ng
8888
> /**
89-
#^^^^^^ template.ng
89+
#^^^^^^ inline-template.ng
9090
> * template: '<div></div>'
91-
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ template.ng
91+
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-template.ng
9292
> */
93-
#^^^^^^ template.ng
93+
#^^^^^^ inline-template.ng
9494
>})
95-
#^^^ template.ng
95+
#^^^ inline-template.ng
9696
>export class TMComponent{}
97-
#^^^^^^^^^^^^^^^^^^^^^^^^^^^ template.ng
97+
#^^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-template.ng
9898
>

0 commit comments

Comments
 (0)