Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
fd4976a9
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fd4976a9
编写于
6月 23, 2017
作者:
R
Ramya Achutha Rao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix indentation when wrapping with abbr #29283
上级
43597e1a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
39 addition
and
9 deletion
+39
-9
extensions/emmet/src/abbreviationActions.ts
extensions/emmet/src/abbreviationActions.ts
+39
-9
未找到文件。
extensions/emmet/src/abbreviationActions.ts
浏览文件 @
fd4976a9
...
...
@@ -13,6 +13,7 @@ import { getExpandOptions, extractAbbreviation, isStyleSheet } from 'vscode-emme
import
{
DocumentStreamReader
}
from
'
./bufferStream
'
;
interface
ExpandAbbreviationInput
{
syntax
:
string
;
abbreviation
:
string
;
rangeToReplace
:
vscode
.
Range
;
textToWrap
?:
string
;
...
...
@@ -33,13 +34,26 @@ export function wrapWithAbbreviation() {
let
expandAbbrList
:
ExpandAbbreviationInput
[]
=
[];
let
firstTextToReplace
:
string
;
let
allTextToReplaceSame
:
boolean
=
true
;
let
preceedingWhiteSpace
=
''
;
editor
.
selections
.
forEach
(
selection
=>
{
let
rangeToReplace
:
vscode
.
Range
=
selection
;
let
rangeToReplace
:
vscode
.
Range
=
selection
.
isReversed
?
new
vscode
.
Range
(
selection
.
active
,
selection
.
anchor
)
:
selection
;
if
(
rangeToReplace
.
isEmpty
)
{
rangeToReplace
=
new
vscode
.
Range
(
rangeToReplace
.
start
.
line
,
0
,
rangeToReplace
.
start
.
line
,
editor
.
document
.
lineAt
(
rangeToReplace
.
start
.
line
).
text
.
length
);
}
let
textToWrap
=
newLine
+
editor
.
document
.
getText
(
rangeToReplace
)
+
newLine
;
const
firstLine
=
editor
.
document
.
lineAt
(
rangeToReplace
.
start
).
text
;
const
matches
=
firstLine
.
match
(
/^
(\s
*
)
/
);
if
(
matches
)
{
preceedingWhiteSpace
=
matches
[
1
];
}
if
(
rangeToReplace
.
start
.
character
<=
preceedingWhiteSpace
.
length
)
{
rangeToReplace
=
new
vscode
.
Range
(
rangeToReplace
.
start
.
line
,
0
,
rangeToReplace
.
end
.
line
,
rangeToReplace
.
end
.
character
);
}
let
textToWrap
=
''
;
for
(
let
i
=
rangeToReplace
.
start
.
line
;
i
<=
rangeToReplace
.
end
.
line
;
i
++
)
{
textToWrap
+=
(
i
===
rangeToReplace
.
start
.
line
?
''
:
newLine
)
+
'
\t
'
+
editor
.
document
.
lineAt
(
i
).
text
.
substr
(
preceedingWhiteSpace
.
length
);
}
if
(
!
firstTextToReplace
)
{
firstTextToReplace
=
textToWrap
;
...
...
@@ -47,10 +61,10 @@ export function wrapWithAbbreviation() {
allTextToReplaceSame
=
false
;
}
expandAbbrList
.
push
({
abbreviation
,
rangeToReplace
,
textToWrap
});
expandAbbrList
.
push
({
syntax
,
abbreviation
,
rangeToReplace
,
textToWrap
});
});
expandAbbr
(
editor
,
expandAbbrList
,
syntax
,
allTextToReplaceSam
e
);
expandAbbr
eviationInRange
(
editor
,
expandAbbrList
,
syntax
,
allTextToReplaceSame
,
preceedingWhiteSpac
e
);
});
}
...
...
@@ -91,10 +105,10 @@ export function expandAbbreviation(args) {
allAbbreviationsSame
=
false
;
}
abbreviationList
.
push
({
abbreviation
,
rangeToReplace
});
abbreviationList
.
push
({
syntax
,
abbreviation
,
rangeToReplace
});
});
expandAbbr
(
editor
,
abbreviationList
,
syntax
,
allAbbreviationsSame
);
expandAbbr
eviationInRange
(
editor
,
abbreviationList
,
syntax
,
allAbbreviationsSame
);
}
...
...
@@ -122,17 +136,18 @@ export function isValidLocationForEmmetAbbreviation(currentNode: Node, syntax: s
return
false
;
}
function
expandAbbr
(
editor
:
vscode
.
TextEditor
,
expandAbbrList
:
ExpandAbbreviationInput
[],
syntax
:
string
,
insertSameSnippet
:
boolean
)
{
function
expandAbbr
eviationInRange
(
editor
:
vscode
.
TextEditor
,
expandAbbrList
:
ExpandAbbreviationInput
[],
syntax
:
string
,
insertSameSnippet
:
boolean
,
preceedingWhiteSpace
:
string
=
''
)
{
if
(
!
expandAbbrList
||
expandAbbrList
.
length
===
0
)
{
return
;
}
const
newLine
=
editor
.
document
.
eol
===
vscode
.
EndOfLine
.
LF
?
'
\n
'
:
'
\r\n
'
;
// Snippet to replace at multiple cursors are not the same
// `editor.insertSnippet` will have to be called for each instance separately
// We will not be able to maintain multiple cursors after snippet insertion
if
(
!
insertSameSnippet
)
{
expandAbbrList
.
forEach
((
expandAbbrInput
:
ExpandAbbreviationInput
)
=>
{
let
expandedText
=
expand
(
expandAbbrInput
.
abbreviation
,
getExpandOptions
(
syntax
,
expandAbbrInput
.
textToWrap
));
let
expandedText
=
expand
AbbrInput
.
textToWrap
?
wrapAbbr
(
expandAbbrInput
,
preceedingWhiteSpace
,
newLine
)
:
expand
(
input
.
abbreviation
,
getExpandOptions
(
input
.
syntax
));
if
(
expandedText
)
{
editor
.
insertSnippet
(
new
vscode
.
SnippetString
(
expandedText
),
expandAbbrInput
.
rangeToReplace
);
}
...
...
@@ -144,11 +159,26 @@ function expandAbbr(editor: vscode.TextEditor, expandAbbrList: ExpandAbbreviatio
// We can pass all ranges to `editor.insertSnippet` in a single call so that
// all cursors are maintained after snippet insertion
const
anyExpandAbbrInput
=
expandAbbrList
[
0
];
let
expandedText
=
expand
(
anyExpandAbbrInput
.
abbreviation
,
getExpandOptions
(
syntax
,
anyExpandAbbrInput
.
textToWrap
));
let
expandedText
=
anyExpandAbbrInput
.
textToWrap
?
wrapAbbr
(
anyExpandAbbrInput
,
preceedingWhiteSpace
,
newLine
)
:
expand
(
input
.
abbreviation
,
getExpandOptions
(
input
.
syntax
));
let
allRanges
=
expandAbbrList
.
map
(
value
=>
{
return
value
.
rangeToReplace
;
});
if
(
expandedText
)
{
editor
.
insertSnippet
(
new
vscode
.
SnippetString
(
expandedText
),
allRanges
);
}
}
function
wrapAbbr
(
input
:
ExpandAbbreviationInput
,
preceedingWhiteSpace
:
string
,
newLine
:
string
):
string
{
let
expandedText
=
expand
(
input
.
abbreviation
,
getExpandOptions
(
input
.
syntax
,
newLine
+
input
.
textToWrap
+
newLine
));
if
(
!
expandedText
)
{
return
;
}
let
lines
=
expandedText
.
split
(
newLine
);
let
finalExpandedText
=
''
;
for
(
let
i
=
0
;
i
<
lines
.
length
;
i
++
)
{
finalExpandedText
+=
newLine
+
preceedingWhiteSpace
+
lines
[
i
];
}
return
finalExpandedText
.
substr
(
newLine
.
length
);
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录