Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
bfbbe132
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,发现更多精彩内容 >>
提交
bfbbe132
编写于
2月 12, 2018
作者:
R
Ramya Achutha Rao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix css emmet abbreviations with : Fixes #43544
上级
768f6c8e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
13 deletion
+15
-13
extensions/emmet/src/abbreviationActions.ts
extensions/emmet/src/abbreviationActions.ts
+4
-2
extensions/emmet/src/test/cssAbbreviationAction.test.ts
extensions/emmet/src/test/cssAbbreviationAction.test.ts
+11
-11
未找到文件。
extensions/emmet/src/abbreviationActions.ts
浏览文件 @
bfbbe132
...
@@ -253,12 +253,14 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
...
@@ -253,12 +253,14 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
if
(
propertyNode
.
terminatorToken
if
(
propertyNode
.
terminatorToken
&&
propertyNode
.
separator
&&
propertyNode
.
separator
&&
position
.
isAfterOrEqual
(
propertyNode
.
separatorToken
.
end
)
&&
position
.
isAfterOrEqual
(
propertyNode
.
separatorToken
.
end
)
&&
position
.
isBeforeOrEqual
(
propertyNode
.
terminatorToken
.
start
))
{
&&
position
.
isBeforeOrEqual
(
propertyNode
.
terminatorToken
.
start
)
&&
abbreviation
.
indexOf
(
'
:
'
)
===
-
1
)
{
return
hexColorRegex
.
test
(
abbreviation
);
return
hexColorRegex
.
test
(
abbreviation
);
}
}
if
(
!
propertyNode
.
terminatorToken
if
(
!
propertyNode
.
terminatorToken
&&
propertyNode
.
separator
&&
propertyNode
.
separator
&&
position
.
isAfterOrEqual
(
propertyNode
.
separatorToken
.
end
))
{
&&
position
.
isAfterOrEqual
(
propertyNode
.
separatorToken
.
end
)
&&
abbreviation
.
indexOf
(
'
:
'
)
===
-
1
)
{
return
hexColorRegex
.
test
(
abbreviation
);
return
hexColorRegex
.
test
(
abbreviation
);
}
}
}
}
...
...
extensions/emmet/src/test/cssAbbreviationAction.test.ts
浏览文件 @
bfbbe132
...
@@ -14,9 +14,9 @@ const completionProvider = new DefaultCompletionItemProvider();
...
@@ -14,9 +14,9 @@ const completionProvider = new DefaultCompletionItemProvider();
const
cssContents
=
`
const
cssContents
=
`
.boo {
.boo {
margin: 20px 10px;
margin: 20px 10px;
m10
pos:f
background-image: url('tryme.png');
background-image: url('tryme.png');
m10
pos:f
}
}
.boo .hoo {
.boo .hoo {
...
@@ -57,9 +57,9 @@ suite('Tests for Expand Abbreviations (CSS)', () => {
...
@@ -57,9 +57,9 @@ suite('Tests for Expand Abbreviations (CSS)', () => {
test
(
'
Expand abbreviation (CSS)
'
,
()
=>
{
test
(
'
Expand abbreviation (CSS)
'
,
()
=>
{
return
withRandomFileEditor
(
cssContents
,
'
css
'
,
(
editor
,
doc
)
=>
{
return
withRandomFileEditor
(
cssContents
,
'
css
'
,
(
editor
,
doc
)
=>
{
editor
.
selections
=
[
new
Selection
(
3
,
1
,
3
,
4
),
new
Selection
(
5
,
1
,
5
,
4
)];
editor
.
selections
=
[
new
Selection
(
3
,
1
,
3
,
6
),
new
Selection
(
5
,
1
,
5
,
6
)];
return
expandEmmetAbbreviation
(
null
).
then
(()
=>
{
return
expandEmmetAbbreviation
(
null
).
then
(()
=>
{
assert
.
equal
(
editor
.
document
.
getText
(),
cssContents
.
replace
(
/
m10/g
,
'
margin: 10px
;
'
));
assert
.
equal
(
editor
.
document
.
getText
(),
cssContents
.
replace
(
/
pos:f/g
,
'
position: fixed
;
'
));
return
Promise
.
resolve
();
return
Promise
.
resolve
();
});
});
});
});
...
@@ -243,22 +243,22 @@ nav#
...
@@ -243,22 +243,22 @@ nav#
});
});
test
(
'
Expand abbreviation in completion list (CSS)
'
,
()
=>
{
test
(
'
Expand abbreviation in completion list (CSS)
'
,
()
=>
{
const
abbreviation
=
'
m10
'
;
const
abbreviation
=
'
pos:f
'
;
const
expandedText
=
'
margin: 10px
;
'
;
const
expandedText
=
'
position: fixed
;
'
;
return
withRandomFileEditor
(
cssContents
,
'
css
'
,
(
editor
,
doc
)
=>
{
return
withRandomFileEditor
(
cssContents
,
'
css
'
,
(
editor
,
doc
)
=>
{
editor
.
selection
=
new
Selection
(
3
,
1
,
3
,
4
);
editor
.
selection
=
new
Selection
(
3
,
1
,
3
,
6
);
const
cancelSrc
=
new
CancellationTokenSource
();
const
cancelSrc
=
new
CancellationTokenSource
();
const
completionPromise1
=
completionProvider
.
provideCompletionItems
(
editor
.
document
,
new
Position
(
3
,
4
),
cancelSrc
.
token
);
const
completionPromise1
=
completionProvider
.
provideCompletionItems
(
editor
.
document
,
new
Position
(
3
,
6
),
cancelSrc
.
token
);
const
completionPromise2
=
completionProvider
.
provideCompletionItems
(
editor
.
document
,
new
Position
(
5
,
4
),
cancelSrc
.
token
);
const
completionPromise2
=
completionProvider
.
provideCompletionItems
(
editor
.
document
,
new
Position
(
5
,
6
),
cancelSrc
.
token
);
if
(
!
completionPromise1
||
!
completionPromise2
)
{
if
(
!
completionPromise1
||
!
completionPromise2
)
{
assert
.
equal
(
1
,
2
,
`Problem with expanding
m10
`
);
assert
.
equal
(
1
,
2
,
`Problem with expanding
pos:f
`
);
return
Promise
.
resolve
();
return
Promise
.
resolve
();
}
}
const
callBack
=
(
completionList
:
CompletionList
)
=>
{
const
callBack
=
(
completionList
:
CompletionList
)
=>
{
if
(
!
completionList
.
items
||
!
completionList
.
items
.
length
)
{
if
(
!
completionList
.
items
||
!
completionList
.
items
.
length
)
{
assert
.
equal
(
1
,
2
,
`Problem with expanding
m10
`
);
assert
.
equal
(
1
,
2
,
`Problem with expanding
pos:f
`
);
return
;
return
;
}
}
const
emmetCompletionItem
=
completionList
.
items
[
0
];
const
emmetCompletionItem
=
completionList
.
items
[
0
];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录