Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
fa4c5561
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,发现更多精彩内容 >>
提交
fa4c5561
编写于
10月 24, 2017
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #36740: wordWrap : Creates an extra step / character at the wrapping point
上级
739f4874
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
68 addition
and
2 deletion
+68
-2
src/vs/editor/common/controller/cursorMoveCommands.ts
src/vs/editor/common/controller/cursorMoveCommands.ts
+25
-2
src/vs/editor/test/common/controller/cursor.test.ts
src/vs/editor/test/common/controller/cursor.test.ts
+43
-0
未找到文件。
src/vs/editor/common/controller/cursorMoveCommands.ts
浏览文件 @
fa4c5561
...
...
@@ -418,7 +418,19 @@ export class CursorMoveCommands {
let
result
:
CursorState
[]
=
[];
for
(
let
i
=
0
,
len
=
cursors
.
length
;
i
<
len
;
i
++
)
{
const
cursor
=
cursors
[
i
];
result
[
i
]
=
CursorState
.
fromViewState
(
MoveOperations
.
moveLeft
(
context
.
config
,
context
.
viewModel
,
cursor
.
viewState
,
inSelectionMode
,
noOfColumns
));
let
newViewState
=
MoveOperations
.
moveLeft
(
context
.
config
,
context
.
viewModel
,
cursor
.
viewState
,
inSelectionMode
,
noOfColumns
);
if
(
noOfColumns
===
1
&&
newViewState
.
position
.
lineNumber
!==
cursor
.
viewState
.
position
.
lineNumber
)
{
// moved over to the previous view line
const
newViewModelPosition
=
context
.
viewModel
.
coordinatesConverter
.
convertViewPositionToModelPosition
(
newViewState
.
position
);
if
(
newViewModelPosition
.
lineNumber
===
cursor
.
modelState
.
position
.
lineNumber
)
{
// stayed on the same model line => pass wrapping point where 2 view positions map to a single model position
newViewState
=
MoveOperations
.
moveLeft
(
context
.
config
,
context
.
viewModel
,
newViewState
,
inSelectionMode
,
1
);
}
}
result
[
i
]
=
CursorState
.
fromViewState
(
newViewState
);
}
return
result
;
}
...
...
@@ -438,7 +450,18 @@ export class CursorMoveCommands {
let
result
:
CursorState
[]
=
[];
for
(
let
i
=
0
,
len
=
cursors
.
length
;
i
<
len
;
i
++
)
{
const
cursor
=
cursors
[
i
];
result
[
i
]
=
CursorState
.
fromViewState
(
MoveOperations
.
moveRight
(
context
.
config
,
context
.
viewModel
,
cursor
.
viewState
,
inSelectionMode
,
noOfColumns
));
let
newViewState
=
MoveOperations
.
moveRight
(
context
.
config
,
context
.
viewModel
,
cursor
.
viewState
,
inSelectionMode
,
noOfColumns
);
if
(
noOfColumns
===
1
&&
newViewState
.
position
.
lineNumber
!==
cursor
.
viewState
.
position
.
lineNumber
)
{
// moved over to the next view line
const
newViewModelPosition
=
context
.
viewModel
.
coordinatesConverter
.
convertViewPositionToModelPosition
(
newViewState
.
position
);
if
(
newViewModelPosition
.
lineNumber
===
cursor
.
modelState
.
position
.
lineNumber
)
{
// stayed on the same model line => pass wrapping point where 2 view positions map to a single model position
newViewState
=
MoveOperations
.
moveRight
(
context
.
config
,
context
.
viewModel
,
newViewState
,
inSelectionMode
,
1
);
}
}
result
[
i
]
=
CursorState
.
fromViewState
(
newViewState
);
}
return
result
;
}
...
...
src/vs/editor/test/common/controller/cursor.test.ts
浏览文件 @
fa4c5561
...
...
@@ -1741,6 +1741,49 @@ suite('Editor Controller - Regression tests', () => {
assertCursor
(
cursor
,
new
Selection
(
1
,
1
,
1
,
1
));
});
});
test
(
'
issue #36740: wordwrap creates an extra step / character at the wrapping point
'
,
()
=>
{
// a single model line => 4 view lines
withMockCodeEditor
([
[
'
Lorem ipsum
'
,
'
dolor sit amet
'
,
'
consectetur
'
,
'
adipiscing elit
'
,
].
join
(
''
)
],
{
wordWrap
:
'
wordWrapColumn
'
,
wordWrapColumn
:
16
},
(
editor
,
cursor
)
=>
{
cursor
.
setSelections
(
'
test
'
,
[
new
Selection
(
1
,
7
,
1
,
7
)]);
moveRight
(
cursor
);
assertCursor
(
cursor
,
new
Selection
(
1
,
8
,
1
,
8
));
moveRight
(
cursor
);
assertCursor
(
cursor
,
new
Selection
(
1
,
9
,
1
,
9
));
moveRight
(
cursor
);
assertCursor
(
cursor
,
new
Selection
(
1
,
10
,
1
,
10
));
moveRight
(
cursor
);
assertCursor
(
cursor
,
new
Selection
(
1
,
11
,
1
,
11
));
moveRight
(
cursor
);
assertCursor
(
cursor
,
new
Selection
(
1
,
12
,
1
,
12
));
moveRight
(
cursor
);
assertCursor
(
cursor
,
new
Selection
(
1
,
13
,
1
,
13
));
// moving to view line 2
moveRight
(
cursor
);
assertCursor
(
cursor
,
new
Selection
(
1
,
14
,
1
,
14
));
moveLeft
(
cursor
);
assertCursor
(
cursor
,
new
Selection
(
1
,
13
,
1
,
13
));
// moving back to view line 1
moveLeft
(
cursor
);
assertCursor
(
cursor
,
new
Selection
(
1
,
12
,
1
,
12
));
});
});
});
suite
(
'
Editor Controller - Cursor Configuration
'
,
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录