Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
0e6a43b9
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,发现更多精彩内容 >>
提交
0e6a43b9
编写于
3月 12, 2016
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #2116: [html] Inconsistent de-indentation behavior while closing html tags using Autocomplete
上级
ba737b58
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
12 deletion
+10
-12
src/vs/languages/html/common/htmlWorker.ts
src/vs/languages/html/common/htmlWorker.ts
+10
-12
未找到文件。
src/vs/languages/html/common/htmlWorker.ts
浏览文件 @
0e6a43b9
...
@@ -237,7 +237,7 @@ export class HTMLWorker {
...
@@ -237,7 +237,7 @@ export class HTMLWorker {
let
contentAfter
=
model
.
getLineContent
(
position
.
lineNumber
).
substr
(
position
.
column
-
1
);
let
contentAfter
=
model
.
getLineContent
(
position
.
lineNumber
).
substr
(
position
.
column
-
1
);
let
closeTag
=
isWhiteSpace
(
contentAfter
)
||
strings
.
startsWith
(
contentAfter
,
'
<
'
)
?
'
>
'
:
''
;
let
closeTag
=
isWhiteSpace
(
contentAfter
)
||
strings
.
startsWith
(
contentAfter
,
'
<
'
)
?
'
>
'
:
''
;
let
collectClosingTagSuggestion
=
(
correctIndent
:
boolean
,
overwriteBefore
:
number
)
=>
{
let
collectClosingTagSuggestion
=
(
overwriteBefore
:
number
)
=>
{
let
endPosition
=
scanner
.
getTokenPosition
();
let
endPosition
=
scanner
.
getTokenPosition
();
let
matchingTag
=
this
.
findMatchingOpenTag
(
scanner
);
let
matchingTag
=
this
.
findMatchingOpenTag
(
scanner
);
if
(
matchingTag
)
{
if
(
matchingTag
)
{
...
@@ -250,15 +250,13 @@ export class HTMLWorker {
...
@@ -250,15 +250,13 @@ export class HTMLWorker {
suggestions
.
suggestions
.
push
(
suggestion
);
suggestions
.
suggestions
.
push
(
suggestion
);
// use indent from start tag
// use indent from start tag
if
(
correctIndent
)
{
let
startPosition
=
scanner
.
getTokenPosition
();
let
startPosition
=
scanner
.
getTokenPosition
();
if
(
endPosition
.
lineNumber
!==
startPosition
.
lineNumber
)
{
if
(
endPosition
.
lineNumber
!==
startPosition
.
lineNumber
)
{
let
startIndent
=
model
.
getLineContent
(
startPosition
.
lineNumber
).
substring
(
0
,
startPosition
.
column
-
1
);
let
startIndent
=
model
.
getLineContent
(
startPosition
.
lineNumber
).
substring
(
0
,
startPosition
.
column
-
1
);
let
endIndent
=
model
.
getLineContent
(
endPosition
.
lineNumber
).
substring
(
0
,
endPosition
.
column
-
1
);
let
endIndent
=
model
.
getLineContent
(
endPosition
.
lineNumber
).
substring
(
0
,
endPosition
.
column
-
1
);
if
(
isWhiteSpace
(
startIndent
)
&&
isWhiteSpace
(
endIndent
))
{
if
(
isWhiteSpace
(
startIndent
)
&&
isWhiteSpace
(
endIndent
))
{
suggestion
.
overwriteBefore
=
position
.
column
-
1
;
// replace from start of line
suggestion
.
overwriteBefore
=
position
.
column
-
1
;
// replace from start of line
suggestion
.
codeSnippet
=
startIndent
+
'
</
'
+
matchingTag
+
closeTag
;
suggestion
.
codeSnippet
=
startIndent
+
'
</
'
+
matchingTag
+
closeTag
;
}
}
}
}
}
return
true
;
return
true
;
...
@@ -268,7 +266,7 @@ export class HTMLWorker {
...
@@ -268,7 +266,7 @@ export class HTMLWorker {
if
(
scanner
.
getTokenType
()
===
DELIM_END
)
{
if
(
scanner
.
getTokenType
()
===
DELIM_END
)
{
let
hasClose
=
collectClosingTagSuggestion
(
true
,
suggestions
.
currentWord
.
length
+
1
);
let
hasClose
=
collectClosingTagSuggestion
(
suggestions
.
currentWord
.
length
+
1
);
if
(
!
hasClose
)
{
if
(
!
hasClose
)
{
this
.
_tagProviders
.
forEach
((
provider
)
=>
{
this
.
_tagProviders
.
forEach
((
provider
)
=>
{
provider
.
collectTags
((
tag
,
label
)
=>
{
provider
.
collectTags
((
tag
,
label
)
=>
{
...
@@ -283,7 +281,7 @@ export class HTMLWorker {
...
@@ -283,7 +281,7 @@ export class HTMLWorker {
});
});
}
}
}
else
{
}
else
{
collectClosingTagSuggestion
(
false
,
suggestions
.
currentWord
.
length
);
collectClosingTagSuggestion
(
suggestions
.
currentWord
.
length
);
this
.
_tagProviders
.
forEach
((
provider
)
=>
{
this
.
_tagProviders
.
forEach
((
provider
)
=>
{
provider
.
collectTags
((
tag
,
label
)
=>
{
provider
.
collectTags
((
tag
,
label
)
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录