Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
96af1d44
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,发现更多精彩内容 >>
提交
96af1d44
编写于
8月 26, 2019
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix accessibility word operatoins and tests
上级
cf7fb776
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
17 deletion
+13
-17
src/vs/editor/common/controller/cursorWordOperations.ts
src/vs/editor/common/controller/cursorWordOperations.ts
+6
-8
src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts
...editor/contrib/wordOperations/test/wordOperations.test.ts
+3
-5
src/vs/editor/contrib/wordOperations/wordOperations.ts
src/vs/editor/contrib/wordOperations/wordOperations.ts
+4
-4
未找到文件。
src/vs/editor/common/controller/cursorWordOperations.ts
浏览文件 @
96af1d44
...
...
@@ -40,7 +40,7 @@ export const enum WordNavigationType {
WordStart
=
0
,
WordStartFast
=
1
,
WordEnd
=
2
,
WordAcessibility
=
3
// Respect chrome defintion of a word
WordAc
c
essibility
=
3
// Respect chrome defintion of a word
}
export
class
WordOperations
{
...
...
@@ -203,13 +203,12 @@ export class WordOperations {
return
new
Position
(
lineNumber
,
prevWordOnLine
?
prevWordOnLine
.
start
+
1
:
1
);
}
if
(
wordNavigationType
===
WordNavigationType
.
WordAcessibility
)
{
if
(
wordNavigationType
===
WordNavigationType
.
WordAc
c
essibility
)
{
while
(
prevWordOnLine
&&
prevWordOnLine
.
wordType
===
WordType
.
Separator
&&
prevWordOnLine
.
end
-
prevWordOnLine
.
start
===
1
)
{
// Skip over
a word made up of one single separator
// Skip over
words made up of only separators
prevWordOnLine
=
WordOperations
.
_findPreviousWordOnLine
(
wordSeparators
,
model
,
new
Position
(
lineNumber
,
prevWordOnLine
.
start
+
1
));
}
...
...
@@ -289,19 +288,18 @@ export class WordOperations {
}
else
{
column
=
model
.
getLineMaxColumn
(
lineNumber
);
}
}
else
if
(
wordNavigationType
===
WordNavigationType
.
WordAcessibility
)
{
}
else
if
(
wordNavigationType
===
WordNavigationType
.
WordAc
c
essibility
)
{
while
(
nextWordOnLine
&&
nextWordOnLine
.
wordType
===
WordType
.
Separator
&&
nextWordOnLine
.
end
-
nextWordOnLine
.
start
===
1
)
{
// Skip over a word made up of one single separator
nextWordOnLine
=
WordOperations
.
_find
Previous
WordOnLine
(
wordSeparators
,
model
,
new
Position
(
lineNumber
,
nextWordOnLine
.
end
+
1
));
nextWordOnLine
=
WordOperations
.
_find
Next
WordOnLine
(
wordSeparators
,
model
,
new
Position
(
lineNumber
,
nextWordOnLine
.
end
+
1
));
}
if
(
nextWordOnLine
)
{
column
=
nextWordOnLine
.
start
+
1
;
column
=
nextWordOnLine
.
end
+
1
;
}
else
{
column
=
model
.
getLineMaxColumn
(
lineNumber
);
}
...
...
src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts
浏览文件 @
96af1d44
...
...
@@ -337,7 +337,7 @@ suite('WordOperations', () => {
});
test
(
'
cursorWordAccessibilityLeft
'
,
()
=>
{
const
EXPECTED
=
[
'
|
|/* |Just |some |more |text |a|+= |3 |+|5|-|3 |+ |7 |*/|
'
].
join
(
'
\n
'
);
const
EXPECTED
=
[
'
|
/* |Just |some |more |text |a+= |3 +|5-|3 + |7 */
'
].
join
(
'
\n
'
);
const
[
text
,]
=
deserializePipePositions
(
EXPECTED
);
const
actualStops
=
testRepeatedActionAndExtractPositions
(
text
,
...
...
@@ -351,16 +351,14 @@ suite('WordOperations', () => {
});
test
(
'
cursorWordAccessibilityRight
'
,
()
=>
{
const
EXPECTED
=
[
'
console|.log|(err|)|
'
,
].
join
(
'
\n
'
);
const
EXPECTED
=
[
'
/* Just| some| more| text| a|+= 3| +5|-3| + 7| */ |
'
].
join
(
'
\n
'
);
const
[
text
,]
=
deserializePipePositions
(
EXPECTED
);
const
actualStops
=
testRepeatedActionAndExtractPositions
(
text
,
new
Position
(
1
,
1
),
ed
=>
cursorWordAccessibilityRight
(
ed
),
ed
=>
ed
.
getPosition
()
!
,
ed
=>
ed
.
getPosition
()
!
.
equals
(
new
Position
(
1
,
17
))
ed
=>
ed
.
getPosition
()
!
.
equals
(
new
Position
(
1
,
50
))
);
const
actual
=
serializePipePositions
(
text
,
actualStops
);
assert
.
deepEqual
(
actual
,
EXPECTED
);
...
...
src/vs/editor/contrib/wordOperations/wordOperations.ts
浏览文件 @
96af1d44
...
...
@@ -177,7 +177,7 @@ export class CursorWordAccessibilityLeft extends WordLeftCommand {
constructor
()
{
super
({
inSelectionMode
:
false
,
wordNavigationType
:
WordNavigationType
.
WordAcessibility
,
wordNavigationType
:
WordNavigationType
.
WordAc
c
essibility
,
id
:
'
cursorWordAccessibilityLeft
'
,
precondition
:
undefined
,
kbOpts
:
{
...
...
@@ -198,7 +198,7 @@ export class CursorWordAccessibilityLeftSelect extends WordLeftCommand {
constructor
()
{
super
({
inSelectionMode
:
true
,
wordNavigationType
:
WordNavigationType
.
WordAcessibility
,
wordNavigationType
:
WordNavigationType
.
WordAc
c
essibility
,
id
:
'
cursorWordAccessibilitLeftSelecty
'
,
precondition
:
undefined
,
kbOpts
:
{
...
...
@@ -297,7 +297,7 @@ export class CursorWordAccessibilityRight extends WordRightCommand {
constructor
()
{
super
({
inSelectionMode
:
false
,
wordNavigationType
:
WordNavigationType
.
WordAcessibility
,
wordNavigationType
:
WordNavigationType
.
WordAc
c
essibility
,
id
:
'
cursorWordAccessibilityRight
'
,
precondition
:
undefined
,
kbOpts
:
{
...
...
@@ -318,7 +318,7 @@ export class CursorWordAccessibilityRightSelect extends WordRightCommand {
constructor
()
{
super
({
inSelectionMode
:
true
,
wordNavigationType
:
WordNavigationType
.
WordAcessibility
,
wordNavigationType
:
WordNavigationType
.
WordAc
c
essibility
,
id
:
'
cursorWordAccessibilityRightSelect
'
,
precondition
:
undefined
,
kbOpts
:
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录