Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a4b47f94
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,发现更多精彩内容 >>
提交
a4b47f94
编写于
8月 10, 2017
作者:
R
Ramya Achutha Rao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Return promise from emmet expand method
上级
161c9849
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
13 addition
and
4 deletion
+13
-4
extensions/emmet/src/abbreviationActions.ts
extensions/emmet/src/abbreviationActions.ts
+13
-4
未找到文件。
extensions/emmet/src/abbreviationActions.ts
浏览文件 @
a4b47f94
...
...
@@ -85,14 +85,14 @@ export function wrapIndividualLinesWithAbbreviation(args) {
export
function
expandEmmetAbbreviation
(
args
)
{
const
syntax
=
getSyntaxFromArgs
(
args
);
if
(
!
syntax
||
!
validate
())
{
return
;
return
Promise
.
resolve
(
false
)
;
}
const
editor
=
vscode
.
window
.
activeTextEditor
;
let
rootNode
=
parseDocument
(
editor
.
document
);
if
(
!
rootNode
)
{
return
;
return
Promise
.
resolve
(
false
)
;
}
let
abbreviationList
:
ExpandAbbreviationInput
[]
=
[];
...
...
@@ -119,13 +119,21 @@ export function expandEmmetAbbreviation(args) {
return
[
rangeToReplace
,
abbr
,
[]];
}
}
let
{
abbreviationRange
,
abbreviation
,
filters
}
=
extractAbbreviation
(
editor
.
document
,
position
);
let
extractedResults
=
extractAbbreviation
(
editor
.
document
,
position
);
if
(
!
extractedResults
)
{
return
[
null
,
''
,
[]];
}
let
{
abbreviationRange
,
abbreviation
,
filters
}
=
extractedResults
;
return
[
new
vscode
.
Range
(
abbreviationRange
.
start
.
line
,
abbreviationRange
.
start
.
character
,
abbreviationRange
.
end
.
line
,
abbreviationRange
.
end
.
character
),
abbreviation
,
filters
];
};
editor
.
selections
.
forEach
(
selection
=>
{
let
position
=
selection
.
isReversed
?
selection
.
anchor
:
selection
.
active
;
let
[
rangeToReplace
,
abbreviation
,
filters
]
=
getAbbreviation
(
editor
.
document
,
selection
,
position
,
syntax
===
'
html
'
);
if
(
!
rangeToReplace
)
{
return
;
}
if
(
!
isAbbreviationValid
(
syntax
,
abbreviation
))
{
vscode
.
window
.
showErrorMessage
(
'
Emmet: Invalid abbreviation
'
);
return
;
...
...
@@ -195,7 +203,7 @@ export function isValidLocationForEmmetAbbreviation(currentNode: Node, syntax: s
*/
function
expandAbbreviationInRange
(
editor
:
vscode
.
TextEditor
,
expandAbbrList
:
ExpandAbbreviationInput
[],
insertSameSnippet
:
boolean
):
Thenable
<
boolean
>
{
if
(
!
expandAbbrList
||
expandAbbrList
.
length
===
0
)
{
return
;
return
Promise
.
resolve
(
false
)
;
}
// Snippet to replace at multiple cursors are not the same
...
...
@@ -223,6 +231,7 @@ function expandAbbreviationInRange(editor: vscode.TextEditor, expandAbbrList: Ex
if
(
expandedText
)
{
return
editor
.
insertSnippet
(
new
vscode
.
SnippetString
(
expandedText
),
allRanges
);
}
return
Promise
.
resolve
(
false
);
}
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录