Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
0e4f7731
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,发现更多精彩内容 >>
提交
0e4f7731
编写于
12月 12, 2016
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
DeleteAllRightAction delete new line when at end
fixes #8575
上级
f983ebad
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
151 addition
and
3 deletion
+151
-3
src/vs/editor/contrib/linesOperations/common/linesOperations.ts
.../editor/contrib/linesOperations/common/linesOperations.ts
+8
-2
src/vs/editor/contrib/linesOperations/test/common/linesOperations.test.ts
...ntrib/linesOperations/test/common/linesOperations.test.ts
+143
-1
未找到文件。
src/vs/editor/contrib/linesOperations/common/linesOperations.ts
浏览文件 @
0e4f7731
...
...
@@ -424,8 +424,13 @@ export class DeleteAllRightAction extends EditorAction {
let
rangesToDelete
:
Range
[]
=
editor
.
getSelections
().
map
((
sel
)
=>
{
if
(
sel
.
isEmpty
())
{
let
maxColumn
=
model
.
getLineMaxColumn
(
sel
.
startLineNumber
);
return
new
Range
(
sel
.
startLineNumber
,
sel
.
startColumn
,
sel
.
startLineNumber
,
maxColumn
);
const
maxColumn
=
model
.
getLineMaxColumn
(
sel
.
startLineNumber
);
if
(
sel
.
startColumn
===
maxColumn
)
{
return
new
Range
(
sel
.
startLineNumber
,
sel
.
startColumn
,
sel
.
startLineNumber
+
1
,
1
);
}
else
{
return
new
Range
(
sel
.
startLineNumber
,
sel
.
startColumn
,
sel
.
startLineNumber
,
maxColumn
);
}
}
return
sel
;
});
...
...
@@ -453,6 +458,7 @@ export class DeleteAllRightAction extends EditorAction {
});
editor
.
executeEdits
(
this
.
id
,
edits
);
editor
.
pushUndoStop
();
}
}
...
...
src/vs/editor/contrib/linesOperations/test/common/linesOperations.test.ts
浏览文件 @
0e4f7731
...
...
@@ -7,7 +7,7 @@
import
*
as
assert
from
'
assert
'
;
import
{
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
withMockCodeEditor
}
from
'
vs/editor/test/common/mocks/mockCodeEditor
'
;
import
{
DeleteAllLeftAction
,
JoinLinesAction
,
TransposeAction
,
UpperCaseAction
,
LowerCaseAction
}
from
'
vs/editor/contrib/linesOperations/common/linesOperations
'
;
import
{
DeleteAllLeftAction
,
JoinLinesAction
,
TransposeAction
,
UpperCaseAction
,
LowerCaseAction
,
DeleteAllRightAction
}
from
'
vs/editor/contrib/linesOperations/common/linesOperations
'
;
suite
(
'
Editor Contrib - Line Operations
'
,
()
=>
{
test
(
'
delete all left
'
,
function
()
{
...
...
@@ -306,4 +306,146 @@ suite('Editor Contrib - Line Operations', () => {
}
);
});
suite
(
'
DeleteAllRightAction
'
,
()
=>
{
test
(
'
should be noop on empty
'
,
()
=>
{
withMockCodeEditor
([
''
],
{},
(
editor
,
cursor
)
=>
{
const
model
=
editor
.
getModel
();
const
action
=
new
DeleteAllRightAction
();
action
.
run
(
null
,
editor
);
assert
.
deepEqual
(
model
.
getLinesContent
(),
[
''
]);
assert
.
deepEqual
(
editor
.
getSelections
(),
[
new
Selection
(
1
,
1
,
1
,
1
)]);
editor
.
setSelection
(
new
Selection
(
1
,
1
,
1
,
1
));
action
.
run
(
null
,
editor
);
assert
.
deepEqual
(
model
.
getLinesContent
(),
[
''
]);
assert
.
deepEqual
(
editor
.
getSelections
(),
[
new
Selection
(
1
,
1
,
1
,
1
)]);
editor
.
setSelections
([
new
Selection
(
1
,
1
,
1
,
1
),
new
Selection
(
1
,
1
,
1
,
1
),
new
Selection
(
1
,
1
,
1
,
1
)]);
action
.
run
(
null
,
editor
);
assert
.
deepEqual
(
model
.
getLinesContent
(),
[
''
]);
assert
.
deepEqual
(
editor
.
getSelections
(),
[
new
Selection
(
1
,
1
,
1
,
1
)]);
});
});
test
(
'
should delete selected range
'
,
()
=>
{
withMockCodeEditor
([
'
hello
'
,
'
world
'
],
{},
(
editor
,
cursor
)
=>
{
const
model
=
editor
.
getModel
();
const
action
=
new
DeleteAllRightAction
();
editor
.
setSelection
(
new
Selection
(
1
,
2
,
1
,
5
));
action
.
run
(
null
,
editor
);
assert
.
deepEqual
(
model
.
getLinesContent
(),
[
'
ho
'
,
'
world
'
]);
assert
.
deepEqual
(
editor
.
getSelections
(),
[
new
Selection
(
1
,
2
,
1
,
2
)]);
editor
.
setSelection
(
new
Selection
(
1
,
1
,
2
,
4
));
action
.
run
(
null
,
editor
);
assert
.
deepEqual
(
model
.
getLinesContent
(),
[
'
ld
'
]);
assert
.
deepEqual
(
editor
.
getSelections
(),
[
new
Selection
(
1
,
1
,
1
,
1
)]);
editor
.
setSelection
(
new
Selection
(
1
,
1
,
1
,
3
));
action
.
run
(
null
,
editor
);
assert
.
deepEqual
(
model
.
getLinesContent
(),
[
''
]);
assert
.
deepEqual
(
editor
.
getSelections
(),
[
new
Selection
(
1
,
1
,
1
,
1
)]);
});
});
test
(
'
should delete to the right of the cursor
'
,
()
=>
{
withMockCodeEditor
([
'
hello
'
,
'
world
'
],
{},
(
editor
,
cursor
)
=>
{
const
model
=
editor
.
getModel
();
const
action
=
new
DeleteAllRightAction
();
editor
.
setSelection
(
new
Selection
(
1
,
3
,
1
,
3
));
action
.
run
(
null
,
editor
);
assert
.
deepEqual
(
model
.
getLinesContent
(),
[
'
he
'
,
'
world
'
]);
assert
.
deepEqual
(
editor
.
getSelections
(),
[
new
Selection
(
1
,
3
,
1
,
3
)]);
editor
.
setSelection
(
new
Selection
(
2
,
1
,
2
,
1
));
action
.
run
(
null
,
editor
);
assert
.
deepEqual
(
model
.
getLinesContent
(),
[
'
he
'
,
''
]);
assert
.
deepEqual
(
editor
.
getSelections
(),
[
new
Selection
(
2
,
1
,
2
,
1
)]);
});
});
test
(
'
should join two lines, if at the end of the line
'
,
()
=>
{
withMockCodeEditor
([
'
hello
'
,
'
world
'
],
{},
(
editor
,
cursor
)
=>
{
const
model
=
editor
.
getModel
();
const
action
=
new
DeleteAllRightAction
();
editor
.
setSelection
(
new
Selection
(
1
,
6
,
1
,
6
));
action
.
run
(
null
,
editor
);
assert
.
deepEqual
(
model
.
getLinesContent
(),
[
'
helloworld
'
]);
assert
.
deepEqual
(
editor
.
getSelections
(),
[
new
Selection
(
1
,
6
,
1
,
6
)]);
editor
.
setSelection
(
new
Selection
(
1
,
6
,
1
,
6
));
action
.
run
(
null
,
editor
);
assert
.
deepEqual
(
model
.
getLinesContent
(),
[
'
hello
'
]);
assert
.
deepEqual
(
editor
.
getSelections
(),
[
new
Selection
(
1
,
6
,
1
,
6
)]);
editor
.
setSelection
(
new
Selection
(
1
,
6
,
1
,
6
));
action
.
run
(
null
,
editor
);
assert
.
deepEqual
(
model
.
getLinesContent
(),
[
'
hello
'
]);
assert
.
deepEqual
(
editor
.
getSelections
(),
[
new
Selection
(
1
,
6
,
1
,
6
)]);
});
});
test
(
'
should work with multiple cursors
'
,
()
=>
{
withMockCodeEditor
([
'
hello
'
,
'
there
'
,
'
world
'
],
{},
(
editor
,
cursor
)
=>
{
const
model
=
editor
.
getModel
();
const
action
=
new
DeleteAllRightAction
();
editor
.
setSelections
([
new
Selection
(
1
,
3
,
1
,
3
),
new
Selection
(
1
,
6
,
1
,
6
),
new
Selection
(
3
,
4
,
3
,
4
),
]);
action
.
run
(
null
,
editor
);
assert
.
deepEqual
(
model
.
getLinesContent
(),
[
'
hethere
'
,
'
wor
'
]);
assert
.
deepEqual
(
editor
.
getSelections
(),
[
new
Selection
(
1
,
3
,
1
,
3
),
new
Selection
(
2
,
4
,
2
,
4
)
]);
action
.
run
(
null
,
editor
);
assert
.
deepEqual
(
model
.
getLinesContent
(),
[
'
he
'
,
'
wor
'
]);
assert
.
deepEqual
(
editor
.
getSelections
(),
[
new
Selection
(
1
,
3
,
1
,
3
),
new
Selection
(
2
,
4
,
2
,
4
)
]);
action
.
run
(
null
,
editor
);
assert
.
deepEqual
(
model
.
getLinesContent
(),
[
'
hewor
'
]);
assert
.
deepEqual
(
editor
.
getSelections
(),
[
new
Selection
(
1
,
3
,
1
,
3
),
new
Selection
(
1
,
6
,
1
,
6
)
]);
action
.
run
(
null
,
editor
);
assert
.
deepEqual
(
model
.
getLinesContent
(),
[
'
he
'
]);
assert
.
deepEqual
(
editor
.
getSelections
(),
[
new
Selection
(
1
,
3
,
1
,
3
)
]);
action
.
run
(
null
,
editor
);
assert
.
deepEqual
(
model
.
getLinesContent
(),
[
'
he
'
]);
assert
.
deepEqual
(
editor
.
getSelections
(),
[
new
Selection
(
1
,
3
,
1
,
3
)
]);
});
});
});
});
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录