Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
949baf78
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,发现更多精彩内容 >>
未验证
提交
949baf78
编写于
4月 27, 2020
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #95591
上级
1a3d767b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
52 addition
and
6 deletion
+52
-6
src/vs/editor/common/commands/shiftCommand.ts
src/vs/editor/common/commands/shiftCommand.ts
+11
-6
src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts
...itor/contrib/linesOperations/test/linesOperations.test.ts
+19
-0
src/vs/editor/test/browser/controller/cursor.test.ts
src/vs/editor/test/browser/controller/cursor.test.ts
+22
-0
未找到文件。
src/vs/editor/common/commands/shiftCommand.ts
浏览文件 @
949baf78
...
...
@@ -103,14 +103,14 @@ export class ShiftCommand implements ICommand {
const
{
tabSize
,
indentSize
,
insertSpaces
}
=
this
.
_opts
;
const
shouldIndentEmptyLines
=
(
startLine
===
endLine
);
// if indenting or outdenting on a whitespace only line
if
(
this
.
_selection
.
isEmpty
())
{
if
(
/^
\s
*$/
.
test
(
model
.
getLineContent
(
startLine
)))
{
this
.
_useLastEditRangeForCursorEndPosition
=
true
;
if
(
this
.
_opts
.
useTabStops
)
{
// if indenting or outdenting on a whitespace only line
if
(
this
.
_selection
.
isEmpty
())
{
if
(
/^
\s
*$/
.
test
(
model
.
getLineContent
(
startLine
)))
{
this
.
_useLastEditRangeForCursorEndPosition
=
true
;
}
}
}
if
(
this
.
_opts
.
useTabStops
)
{
// keep track of previous line's "miss-alignment"
let
previousLineExtraSpaces
=
0
,
extraSpaces
=
0
;
for
(
let
lineNumber
=
startLine
;
lineNumber
<=
endLine
;
lineNumber
++
,
previousLineExtraSpaces
=
extraSpaces
)
{
...
...
@@ -188,6 +188,11 @@ export class ShiftCommand implements ICommand {
}
}
else
{
// if indenting or outdenting on a whitespace only line
if
(
!
this
.
_opts
.
isUnshift
&&
this
.
_selection
.
isEmpty
()
&&
model
.
getLineLength
(
startLine
)
===
0
)
{
this
.
_useLastEditRangeForCursorEndPosition
=
true
;
}
const
oneIndent
=
(
insertSpaces
?
cachedStringRepeat
(
'
'
,
indentSize
)
:
'
\t
'
);
for
(
let
lineNumber
=
startLine
;
lineNumber
<=
endLine
;
lineNumber
++
)
{
...
...
src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts
浏览文件 @
949baf78
...
...
@@ -960,6 +960,25 @@ suite('Editor Contrib - Line Operations', () => {
model
.
dispose
();
});
test
(
'
Indenting on empty line should move cursor
'
,
()
=>
{
const
model
=
createTextModel
(
[
''
].
join
(
'
\n
'
)
);
withTestCodeEditor
(
null
,
{
model
:
model
,
useTabStops
:
false
},
(
editor
)
=>
{
const
indentLinesAction
=
new
IndentLinesAction
();
editor
.
setPosition
(
new
Position
(
1
,
1
));
executeAction
(
indentLinesAction
,
editor
);
assert
.
equal
(
model
.
getLineContent
(
1
),
'
'
);
assert
.
deepEqual
(
editor
.
getSelection
(),
new
Selection
(
1
,
5
,
1
,
5
));
});
model
.
dispose
();
});
test
(
'
issue #62112: Delete line does not work properly when multiple cursors are on line
'
,
()
=>
{
const
TEXT
=
[
'
a
'
,
...
...
src/vs/editor/test/browser/controller/cursor.test.ts
浏览文件 @
949baf78
...
...
@@ -1428,6 +1428,28 @@ suite('Editor Controller - Regression tests', () => {
model
.
dispose
();
});
test
(
'
issue #95591: Unindenting moves cursor to beginning of line
'
,
()
=>
{
let
model
=
createTextModel
(
[
'
'
].
join
(
'
\n
'
)
);
withTestCodeEditor
(
null
,
{
model
:
model
,
useTabStops
:
false
},
(
editor
,
cursor
)
=>
{
moveTo
(
cursor
,
1
,
9
,
false
);
assertCursor
(
cursor
,
new
Selection
(
1
,
9
,
1
,
9
));
CoreEditingCommands
.
Outdent
.
runEditorCommand
(
null
,
editor
,
null
);
assert
.
equal
(
model
.
getLineContent
(
1
),
'
'
);
assertCursor
(
cursor
,
new
Selection
(
1
,
5
,
1
,
5
));
});
model
.
dispose
();
});
test
(
'
Bug #16657: [editor] Tab on empty line of zero indentation moves cursor to position (1,1)
'
,
()
=>
{
let
model
=
createTextModel
(
[
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录