Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
ce558b7e
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,发现更多精彩内容 >>
提交
ce558b7e
编写于
2月 20, 2017
作者:
A
Alexandru Dima
提交者:
GitHub
2月 20, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #15564 from kaiwood/expand-line-selection
Include newline when expanding line selection
上级
6955e1fa
083dff85
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
19 deletion
+18
-19
src/vs/editor/common/controller/oneCursor.ts
src/vs/editor/common/controller/oneCursor.ts
+9
-10
src/vs/editor/test/common/controller/cursor.test.ts
src/vs/editor/test/common/controller/cursor.test.ts
+9
-9
未找到文件。
src/vs/editor/common/controller/oneCursor.ts
浏览文件 @
ce558b7e
...
...
@@ -714,23 +714,22 @@ export class OneCursorOp {
let
viewSel
=
cursor
.
viewState
.
selection
;
let
viewStartLineNumber
=
viewSel
.
startLineNumber
;
let
viewStartColumn
=
viewSel
.
startColumn
;
let
viewEndLineNumber
=
viewSel
.
endLineNumber
;
let
viewEndColumn
=
viewSel
.
endColumn
;
let
viewEndMaxColumn
=
cursor
.
viewModel
.
getLineMaxColumn
(
viewEndLineNumber
);
if
(
viewStartColumn
!==
1
||
viewEndColumn
!==
viewEndMaxColumn
)
{
viewStartColumn
=
1
;
viewEndColumn
=
viewEndMaxColumn
;
}
else
{
// Expand selection with one more line down
let
moveResult
=
MoveOperations
.
down
(
cursor
.
config
,
cursor
.
viewModel
,
viewEndLineNumber
,
viewEndColumn
,
0
,
1
,
true
);
viewEndLineNumber
=
moveResult
.
lineNumber
;
let
moveResult
=
MoveOperations
.
down
(
cursor
.
config
,
cursor
.
viewModel
,
viewEndLineNumber
,
viewEndColumn
,
0
,
1
,
true
);
viewEndLineNumber
=
moveResult
.
lineNumber
;
// If we reach the last line of the document, select until the end of line too
if
(
cursor
.
viewModel
.
getLineCount
()
===
viewSel
.
endLineNumber
)
{
viewEndColumn
=
cursor
.
viewModel
.
getLineMaxColumn
(
viewEndLineNumber
);
}
else
{
viewEndColumn
=
1
;
}
cursor
.
moveViewPosition
(
false
,
viewStartLineNumber
,
viewStartColumn
,
0
,
true
);
cursor
.
moveViewPosition
(
false
,
viewStartLineNumber
,
1
,
0
,
true
);
cursor
.
moveViewPosition
(
true
,
viewEndLineNumber
,
viewEndColumn
,
0
,
true
);
return
true
;
}
...
...
src/vs/editor/test/common/controller/cursor.test.ts
浏览文件 @
ce558b7e
...
...
@@ -749,33 +749,33 @@ suite('Editor Controller - Cursor', () => {
// let LINE1 = ' \tMy First Line\t ';
moveTo
(
thisCursor
,
1
,
1
);
cursorCommand
(
thisCursor
,
H
.
ExpandLineSelection
);
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
1
,
LINE1
.
length
+
1
));
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
2
,
1
));
moveTo
(
thisCursor
,
1
,
2
);
cursorCommand
(
thisCursor
,
H
.
ExpandLineSelection
);
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
1
,
LINE1
.
length
+
1
));
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
2
,
1
));
moveTo
(
thisCursor
,
1
,
5
);
cursorCommand
(
thisCursor
,
H
.
ExpandLineSelection
);
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
1
,
LINE1
.
length
+
1
));
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
2
,
1
));
moveTo
(
thisCursor
,
1
,
19
);
cursorCommand
(
thisCursor
,
H
.
ExpandLineSelection
);
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
1
,
LINE1
.
length
+
1
));
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
2
,
1
));
moveTo
(
thisCursor
,
1
,
20
);
cursorCommand
(
thisCursor
,
H
.
ExpandLineSelection
);
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
1
,
LINE1
.
length
+
1
));
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
2
,
1
));
moveTo
(
thisCursor
,
1
,
21
);
cursorCommand
(
thisCursor
,
H
.
ExpandLineSelection
);
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
1
,
LINE1
.
length
+
1
));
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
2
,
1
));
cursorCommand
(
thisCursor
,
H
.
ExpandLineSelection
);
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
2
,
LINE2
.
length
+
1
));
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
3
,
1
));
cursorCommand
(
thisCursor
,
H
.
ExpandLineSelection
);
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
3
,
LINE3
.
length
+
1
));
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
4
,
1
));
cursorCommand
(
thisCursor
,
H
.
ExpandLineSelection
);
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
4
,
LINE4
.
length
+
1
));
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
5
,
1
));
cursorCommand
(
thisCursor
,
H
.
ExpandLineSelection
);
assertCursor
(
thisCursor
,
new
Selection
(
1
,
1
,
5
,
LINE5
.
length
+
1
));
cursorCommand
(
thisCursor
,
H
.
ExpandLineSelection
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录