Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
05960dc4
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,发现更多精彩内容 >>
提交
05960dc4
编写于
12月 09, 2015
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #1120: Indenting should not indent empty lines
上级
2b2d8133
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
52 addition
and
6 deletion
+52
-6
src/vs/editor/common/commands/shiftCommand.ts
src/vs/editor/common/commands/shiftCommand.ts
+7
-1
src/vs/editor/test/common/commands/shiftCommand.test.ts
src/vs/editor/test/common/commands/shiftCommand.test.ts
+45
-5
未找到文件。
src/vs/editor/common/commands/shiftCommand.ts
浏览文件 @
05960dc4
...
@@ -61,7 +61,8 @@ export class ShiftCommand implements EditorCommon.ICommand {
...
@@ -61,7 +61,8 @@ export class ShiftCommand implements EditorCommon.ICommand {
let
lineNumber
:
number
,
let
lineNumber
:
number
,
tabSize
=
this
.
_opts
.
tabSize
,
tabSize
=
this
.
_opts
.
tabSize
,
oneIndent
=
this
.
_opts
.
oneIndent
;
oneIndent
=
this
.
_opts
.
oneIndent
,
shouldIndentEmptyLines
=
(
startLine
===
endLine
);
// indents[i] represents i * oneIndent
// indents[i] represents i * oneIndent
let
indents
:
string
[]
=
[
''
,
oneIndent
];
let
indents
:
string
[]
=
[
''
,
oneIndent
];
...
@@ -85,6 +86,11 @@ export class ShiftCommand implements EditorCommon.ICommand {
...
@@ -85,6 +86,11 @@ export class ShiftCommand implements EditorCommon.ICommand {
continue
;
continue
;
}
}
if
(
!
shouldIndentEmptyLines
&&
!
this
.
_opts
.
isUnshift
&&
lineText
.
length
===
0
)
{
// do not indent empty lines => nothing to do
continue
;
}
if
(
indentationEndIndex
===
-
1
)
{
if
(
indentationEndIndex
===
-
1
)
{
// the entire line is whitespace
// the entire line is whitespace
indentationEndIndex
=
lineText
.
length
;
indentationEndIndex
=
lineText
.
length
;
...
...
src/vs/editor/test/common/commands/shiftCommand.test.ts
浏览文件 @
05960dc4
...
@@ -277,10 +277,50 @@ suite('Editor Commands - ShiftCommand', () => {
...
@@ -277,10 +277,50 @@ suite('Editor Commands - ShiftCommand', () => {
'
My First Line
'
,
'
My First Line
'
,
'
\t\t
My Second Line
'
,
'
\t\t
My Second Line
'
,
'
Third Line
'
,
'
Third Line
'
,
'
\t
'
,
''
,
'
\t
123
'
],
new
Selection
(
4
,
1
,
5
,
3
)
);
});
test
(
'
issue #1120 TAB should not indent empty lines in a multi-line selection
'
,
()
=>
{
testShiftCommand
(
[
'
My First Line
'
,
'
\t\t
My Second Line
'
,
'
Third Line
'
,
''
,
'
123
'
],
new
Selection
(
1
,
1
,
5
,
2
),
[
'
\t
My First Line
'
,
'
\t\t\t
My Second Line
'
,
'
\t\t
Third Line
'
,
''
,
'
\t
123
'
'
\t
123
'
],
],
new
Selection
(
4
,
2
,
5
,
3
)
new
Selection
(
1
,
2
,
5
,
3
)
);
testShiftCommand
(
[
'
My First Line
'
,
'
\t\t
My Second Line
'
,
'
Third Line
'
,
''
,
'
123
'
],
new
Selection
(
4
,
1
,
5
,
1
),
[
'
My First Line
'
,
'
\t\t
My Second Line
'
,
'
Third Line
'
,
'
\t
'
,
'
123
'
],
new
Selection
(
4
,
2
,
5
,
1
)
);
);
});
});
...
@@ -464,7 +504,7 @@ suite('Editor Commands - ShiftCommand', () => {
...
@@ -464,7 +504,7 @@ suite('Editor Commands - ShiftCommand', () => {
'
\t
My First Line
'
,
'
\t
My First Line
'
,
'
\t
My Second Line
'
,
'
\t
My Second Line
'
,
'
\t
Third Line
'
,
'
\t
Third Line
'
,
'
\t
'
,
''
,
'
\t
123
'
'
\t
123
'
],
],
new
Selection
(
1
,
2
,
5
,
5
)
new
Selection
(
1
,
2
,
5
,
5
)
...
@@ -503,13 +543,13 @@ suite('Editor Commands - ShiftCommand', () => {
...
@@ -503,13 +543,13 @@ suite('Editor Commands - ShiftCommand', () => {
],
],
new
Selection
(
1
,
1
,
5
,
20
),
new
Selection
(
1
,
1
,
5
,
20
),
[
[
'
\t
'
,
''
,
'
\t
/**
'
,
'
\t
/**
'
,
'
\t
* a doc comment
'
,
'
\t
* a doc comment
'
,
'
\t
*/
'
,
'
\t
*/
'
,
'
\t
function hello() {}
'
'
\t
function hello() {}
'
],
],
new
Selection
(
1
,
2
,
5
,
21
)
new
Selection
(
1
,
1
,
5
,
21
)
);
);
testUnshiftCommandInDocBlockCommentMode
(
testUnshiftCommandInDocBlockCommentMode
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录