Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
190367eb
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,发现更多精彩内容 >>
提交
190367eb
编写于
8月 14, 2017
作者:
R
Ramya Achutha Rao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lookahead not needed when running emmet expand #32478
上级
224df127
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
4 deletion
+8
-4
extensions/emmet/npm-shrinkwrap.json
extensions/emmet/npm-shrinkwrap.json
+3
-3
extensions/emmet/package.json
extensions/emmet/package.json
+1
-1
extensions/emmet/src/abbreviationActions.ts
extensions/emmet/src/abbreviationActions.ts
+4
-0
未找到文件。
extensions/emmet/npm-shrinkwrap.json
浏览文件 @
190367eb
...
@@ -38,9 +38,9 @@
...
@@ -38,9 +38,9 @@
"resolved"
:
"https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz"
"resolved"
:
"https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz"
},
},
"vscode-emmet-helper"
:
{
"vscode-emmet-helper"
:
{
"version"
:
"1.0.1
4
"
,
"version"
:
"1.0.1
5
"
,
"from"
:
"vscode-emmet-helper@>=1.0.1
4
<2.0.0"
,
"from"
:
"vscode-emmet-helper@>=1.0.1
5
<2.0.0"
,
"resolved"
:
"https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-1.0.1
4
.tgz"
"resolved"
:
"https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-1.0.1
5
.tgz"
},
},
"vscode-languageserver-types"
:
{
"vscode-languageserver-types"
:
{
"version"
:
"3.3.0"
,
"version"
:
"3.3.0"
,
...
...
extensions/emmet/package.json
浏览文件 @
190367eb
...
@@ -212,7 +212,7 @@
...
@@ -212,7 +212,7 @@
"@emmetio/html-matcher"
:
"^0.3.1"
,
"@emmetio/html-matcher"
:
"^0.3.1"
,
"@emmetio/css-parser"
:
"^0.4.0"
,
"@emmetio/css-parser"
:
"^0.4.0"
,
"@emmetio/math-expression"
:
"^0.1.1"
,
"@emmetio/math-expression"
:
"^0.1.1"
,
"vscode-emmet-helper"
:
"^1.0.1
4
"
,
"vscode-emmet-helper"
:
"^1.0.1
5
"
,
"vscode-languageserver-types"
:
"^3.0.3"
,
"vscode-languageserver-types"
:
"^3.0.3"
,
"image-size"
:
"^0.5.2"
,
"image-size"
:
"^0.5.2"
,
"vscode-nls"
:
"2.0.2"
"vscode-nls"
:
"2.0.2"
...
...
extensions/emmet/src/abbreviationActions.ts
浏览文件 @
190367eb
...
@@ -132,7 +132,11 @@ export function expandEmmetAbbreviation(args): Thenable<boolean> {
...
@@ -132,7 +132,11 @@ export function expandEmmetAbbreviation(args): Thenable<boolean> {
return
[
rangeToReplace
,
abbr
,
[]];
return
[
rangeToReplace
,
abbr
,
[]];
}
}
}
}
<<<<<<<
HEAD
let
extractedResults
=
extractAbbreviation
(
editor
.
document
,
position
);
let
extractedResults
=
extractAbbreviation
(
editor
.
document
,
position
);
=======
let
extractedResults
=
extractAbbreviation
(
editor
.
document
,
position
,
false
);
>>>>>>>
1531
c8d
...
lookahead
not
needed
when
running
emmet
expand
#
32478
if
(
!
extractedResults
)
{
if
(
!
extractedResults
)
{
return
[
null
,
''
,
[]];
return
[
null
,
''
,
[]];
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录