Skip to content

Commit f0422f5

Browse files
atscottatscott
authored
fix(syntaxes): Support scss for inline styles (angular#1951)
SCSS is a superset of CSS. In order to cover more languages with our syntax highlighting grammers, we can use SCSS as the embedded language for inline styles. fixes angular#1950
1 parent bbac5e0 commit f0422f5

File tree

6 files changed

+21
-17
lines changed

6 files changed

+21
-17
lines changed

‎.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU=‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
.npmrc=974837034
44
pnpm-lock.yaml=-1547217849
55
yarn.lock=1378739518
6-
package.json=-1312182168
6+
package.json=-817439735
77
pnpm-workspace.yaml=1711114604

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
"source.ts"
159159
],
160160
"embeddedLanguages": {
161-
"source.css": "css"
161+
"source.css.scss": "scss"
162162
}
163163
},
164164
{

‎syntaxes/inline-styles.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@
8787
"name": "string"
8888
}
8989
},
90-
"contentName": "source.css",
90+
"contentName": "source.css.scss",
9191
"patterns": [
9292
{
93-
"include": "source.css"
93+
"include": "source.css.scss"
9494
}
9595
]
9696
}

‎syntaxes/src/inline-styles.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ export const InlineStyles: GrammarDefinition = {
4545
beginCaptures: {1: {name: 'string'}},
4646
end: /\1/,
4747
endCaptures: {0: {name: 'string'}},
48-
contentName: 'source.css',
49-
patterns: [{include: 'source.css'}]
48+
contentName: 'source.css.scss',
49+
patterns: [{include: 'source.css.scss'}]
5050
}
5151
}
5252
};

‎syntaxes/test/data/inline-styles.ts.snap‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# ^ inline-styles.ng meta.array.literal.ts meta.brace.square.ts
1414
# ^ inline-styles.ng
1515
# ^ inline-styles.ng string
16-
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css
16+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css.scss
1717
# ^ inline-styles.ng string
1818
# ^ inline-styles.ng
1919
# ^ inline-styles.ng meta.array.literal.ts meta.brace.square.ts
@@ -30,13 +30,13 @@
3030
> '.example { width: 100px; }',
3131
#^^^^ inline-styles.ng
3232
# ^ inline-styles.ng string
33-
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css
33+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css.scss
3434
# ^ inline-styles.ng string
3535
# ^^ inline-styles.ng
3636
> '.example { height: 100px; }',
3737
#^^^^ inline-styles.ng
3838
# ^ inline-styles.ng string
39-
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css
39+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css.scss
4040
# ^ inline-styles.ng string
4141
# ^^ inline-styles.ng
4242
> ],
@@ -54,7 +54,7 @@
5454
# ^ inline-styles.ng meta.array.literal.ts meta.brace.square.ts
5555
# ^ inline-styles.ng
5656
# ^ inline-styles.ng string
57-
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css
57+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css.scss
5858
# ^ inline-styles.ng string
5959
# ^ inline-styles.ng
6060
# ^ inline-styles.ng meta.array.literal.ts meta.brace.square.ts
@@ -67,7 +67,7 @@
6767
# ^ inline-styles.ng meta.array.literal.ts meta.brace.square.ts
6868
# ^ inline-styles.ng
6969
# ^ inline-styles.ng string
70-
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css
70+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css.scss
7171
# ^ inline-styles.ng string
7272
# ^ inline-styles.ng
7373
# ^ inline-styles.ng meta.array.literal.ts meta.brace.square.ts
@@ -80,7 +80,7 @@
8080
# ^ inline-styles.ng meta.array.literal.ts meta.brace.square.ts
8181
# ^ inline-styles.ng
8282
# ^ inline-styles.ng string
83-
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css
83+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css.scss
8484
# ^ inline-styles.ng string
8585
# ^ inline-styles.ng
8686
# ^ inline-styles.ng meta.array.literal.ts meta.brace.square.ts
@@ -97,7 +97,7 @@
9797
# ^^^^^^^ inline-styles.ng
9898
# ^ inline-styles.ng
9999
# ^ inline-styles.ng string
100-
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css
100+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css.scss
101101
# ^ inline-styles.ng string
102102
# ^ inline-styles.ng
103103
# ^ inline-styles.ng meta.brace.round.ts
@@ -114,7 +114,7 @@
114114
# ^^^^^^ inline-styles.ng
115115
# ^ inline-styles.ng
116116
# ^ inline-styles.ng string
117-
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css
117+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css.scss
118118
# ^ inline-styles.ng string
119119
# ^ inline-styles.ng
120120
# ^ inline-styles.ng meta.brace.round.ts
@@ -126,7 +126,7 @@
126126
# ^ inline-styles.ng meta.object-literal.key.ts punctuation.separator.key-value.ts
127127
# ^^ inline-styles.ng
128128
# ^ inline-styles.ng string
129-
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css
129+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css.scss
130130
# ^ inline-styles.ng string
131131
# ^ inline-styles.ng
132132
# ^^ inline-styles.ng
@@ -136,7 +136,7 @@
136136
# ^ inline-styles.ng meta.object-literal.key.ts punctuation.separator.key-value.ts
137137
# ^^ inline-styles.ng
138138
# ^ inline-styles.ng string
139-
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css
139+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css.scss
140140
# ^ inline-styles.ng string
141141
# ^ inline-styles.ng
142142
# ^^ inline-styles.ng
@@ -146,7 +146,7 @@
146146
# ^ inline-styles.ng meta.object-literal.key.ts punctuation.separator.key-value.ts
147147
# ^^ inline-styles.ng
148148
# ^ inline-styles.ng string
149-
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css
149+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-styles.ng source.css.scss
150150
# ^ inline-styles.ng string
151151
# ^ inline-styles.ng
152152
# ^^ inline-styles.ng

‎syntaxes/test/dummy/scss.tmLanguage-dummy.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"comment": "Dummy SCSS TextMate grammar for use in testing",
3+
"scopeName": "source.css.scss"
4+
}

0 commit comments

Comments
 (0)