Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
53e6c567
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
53e6c567
编写于
4月 25, 2016
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[sass] fix highlighting of @mixin inside
@if
(for #5528)
上级
dcbeb51e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
161 addition
and
3 deletion
+161
-3
extensions/vscode-colorize-tests/test/colorize-fixtures/test.scss
...ns/vscode-colorize-tests/test/colorize-fixtures/test.scss
+4
-0
extensions/vscode-colorize-tests/test/colorize-results/test_scss.json
...scode-colorize-tests/test/colorize-results/test_scss.json
+154
-0
src/vs/languages/sass/common/sass.ts
src/vs/languages/sass/common/sass.ts
+3
-3
未找到文件。
extensions/vscode-colorize-tests/test/colorize-fixtures/test.scss
浏览文件 @
53e6c567
...
@@ -253,6 +253,10 @@ $values: #ff0000, #00ff00, #0000ff;
...
@@ -253,6 +253,10 @@ $values: #ff0000, #00ff00, #0000ff;
}
}
}
}
@if
$attr
{
@mixin
apply-to-ie6-only
{
}
}
/* attributes */
/* attributes */
...
...
extensions/vscode-colorize-tests/test/colorize-results/test_scss.json
浏览文件 @
53e6c567
...
@@ -13056,6 +13056,160 @@
...
@@ -13056,6 +13056,160 @@
"hc_black": ".hc-black .token rgb(255, 255, 255)"
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
}
},
},
{
"c": "@if",
"t": "at-rule.control.flow.keyword.sass",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword.control rgb(197, 134, 192)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword.control rgb(175, 0, 219)",
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.keyword.control rgb(86, 156, 214)",
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.keyword.control rgb(0, 0, 255)",
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.keyword.control rgb(86, 156, 214)"
}
},
{
"c": " ",
"t": "",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": "$attr",
"t": "ref.sass.variable",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": " ",
"t": "",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": "{",
"t": "curly.punctuation.sass",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": " ",
"t": "",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": "@mixin",
"t": "at-rule.control.keyword.sass",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword.control rgb(197, 134, 192)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword.control rgb(175, 0, 219)",
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.keyword.control rgb(86, 156, 214)",
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.keyword.control rgb(0, 0, 255)",
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.keyword.control rgb(86, 156, 214)"
}
},
{
"c": " ",
"t": "",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": "apply-to-ie6-only",
"t": "function.name.sass.support",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": " ",
"t": "",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": "{",
"t": "curly.punctuation.sass",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": " ",
"t": "",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": "}",
"t": "curly.punctuation.sass",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": "}",
"t": "curly.punctuation.sass",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
{
"c": "/* attributes */",
"c": "/* attributes */",
"t": "comment.sass",
"t": "comment.sass",
...
...
src/vs/languages/sass/common/sass.ts
浏览文件 @
53e6c567
...
@@ -50,9 +50,6 @@ export var language = <Types.ILanguage>{
...
@@ -50,9 +50,6 @@ export var language = <Types.ILanguage>{
tokenizer
:
{
tokenizer
:
{
root
:
[
root
:
[
{
include
:
'
@selector
'
},
{
include
:
'
@selector
'
},
[
'
[@](charset|namespace)
'
,
{
token
:
sassTokenTypes
.
TOKEN_AT_KEYWORD
,
next
:
'
@declarationbody
'
}],
[
'
[@](function)
'
,
{
token
:
sassTokenTypes
.
TOKEN_AT_KEYWORD
,
next
:
'
@functiondeclaration
'
}],
[
'
[@](mixin)
'
,
{
token
:
sassTokenTypes
.
TOKEN_AT_KEYWORD
,
next
:
'
@mixindeclaration
'
}],
],
],
selector
:
[
selector
:
[
...
@@ -63,6 +60,9 @@ export var language = <Types.ILanguage>{
...
@@ -63,6 +60,9 @@ export var language = <Types.ILanguage>{
[
'
[@](include)
'
,
{
token
:
sassTokenTypes
.
TOKEN_AT_KEYWORD
,
next
:
'
@includedeclaration
'
}],
// sass: include statement
[
'
[@](include)
'
,
{
token
:
sassTokenTypes
.
TOKEN_AT_KEYWORD
,
next
:
'
@includedeclaration
'
}],
// sass: include statement
[
'
[@](keyframes|-webkit-keyframes|-moz-keyframes|-o-keyframes)
'
,
{
token
:
sassTokenTypes
.
TOKEN_AT_KEYWORD
,
next
:
'
@keyframedeclaration
'
}],
[
'
[@](keyframes|-webkit-keyframes|-moz-keyframes|-o-keyframes)
'
,
{
token
:
sassTokenTypes
.
TOKEN_AT_KEYWORD
,
next
:
'
@keyframedeclaration
'
}],
[
'
[@](page|content|font-face|-moz-document)
'
,
{
token
:
sassTokenTypes
.
TOKEN_AT_KEYWORD
}],
// sass: placeholder for includes
[
'
[@](page|content|font-face|-moz-document)
'
,
{
token
:
sassTokenTypes
.
TOKEN_AT_KEYWORD
}],
// sass: placeholder for includes
[
'
[@](charset|namespace)
'
,
{
token
:
sassTokenTypes
.
TOKEN_AT_KEYWORD
,
next
:
'
@declarationbody
'
}],
[
'
[@](function)
'
,
{
token
:
sassTokenTypes
.
TOKEN_AT_KEYWORD
,
next
:
'
@functiondeclaration
'
}],
[
'
[@](mixin)
'
,
{
token
:
sassTokenTypes
.
TOKEN_AT_KEYWORD
,
next
:
'
@mixindeclaration
'
}],
[
'
url(
\\
-prefix)?
\\
(
'
,
{
token
:
'
support.function.name
'
,
bracket
:
'
@open
'
,
next
:
'
@urldeclaration
'
}],
[
'
url(
\\
-prefix)?
\\
(
'
,
{
token
:
'
support.function.name
'
,
bracket
:
'
@open
'
,
next
:
'
@urldeclaration
'
}],
{
include
:
'
@controlstatement
'
},
// sass control statements
{
include
:
'
@controlstatement
'
},
// sass control statements
{
include
:
'
@selectorname
'
},
{
include
:
'
@selectorname
'
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录