Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
9396ee52
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,发现更多精彩内容 >>
提交
9396ee52
编写于
4月 17, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #12887
上级
6428c002
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
6 deletion
+24
-6
src/vs/editor/common/controller/cursorWordOperations.ts
src/vs/editor/common/controller/cursorWordOperations.ts
+9
-6
src/vs/editor/test/browser/controller/cursor.test.ts
src/vs/editor/test/browser/controller/cursor.test.ts
+15
-0
未找到文件。
src/vs/editor/common/controller/cursorWordOperations.ts
浏览文件 @
9396ee52
...
...
@@ -384,20 +384,20 @@ export class WordOperations {
public
static
word
(
config
:
CursorConfiguration
,
model
:
ICursorSimpleModel
,
cursor
:
SingleCursorState
,
inSelectionMode
:
boolean
,
position
:
Position
):
SingleCursorState
{
const
wordSeparators
=
getMapForWordSeparators
(
config
.
wordSeparators
);
let
prevWord
=
WordOperations
.
_findPreviousWordOnLine
(
wordSeparators
,
model
,
position
);
let
isInPrevWord
=
(
prevWord
&&
prevWord
.
wordType
===
WordType
.
Regular
&&
prevWord
.
start
<
position
.
column
-
1
&&
position
.
column
-
1
<=
prevWord
.
end
);
let
nextWord
=
WordOperations
.
_findNextWordOnLine
(
wordSeparators
,
model
,
position
);
let
isInNextWord
=
(
nextWord
&&
nextWord
.
wordType
===
WordType
.
Regular
&&
nextWord
.
start
<
position
.
column
-
1
&&
position
.
column
-
1
<=
nextWord
.
end
);
if
(
!
inSelectionMode
)
{
// Entering word selection for the first time
const
isTouchingPrevWord
=
(
prevWord
&&
prevWord
.
wordType
===
WordType
.
Regular
&&
prevWord
.
start
<=
position
.
column
-
1
&&
position
.
column
-
1
<=
prevWord
.
end
);
const
isTouchingNextWord
=
(
nextWord
&&
nextWord
.
wordType
===
WordType
.
Regular
&&
nextWord
.
start
<=
position
.
column
-
1
&&
position
.
column
-
1
<=
nextWord
.
end
);
let
startColumn
:
number
;
let
endColumn
:
number
;
if
(
is
In
PrevWord
)
{
if
(
is
Touching
PrevWord
)
{
startColumn
=
prevWord
.
start
+
1
;
endColumn
=
prevWord
.
end
+
1
;
}
else
if
(
is
In
NextWord
)
{
}
else
if
(
is
Touching
NextWord
)
{
startColumn
=
nextWord
.
start
+
1
;
endColumn
=
nextWord
.
end
+
1
;
}
else
{
...
...
@@ -419,13 +419,16 @@ export class WordOperations {
);
}
const
isInsidePrevWord
=
(
prevWord
&&
prevWord
.
wordType
===
WordType
.
Regular
&&
prevWord
.
start
<
position
.
column
-
1
&&
position
.
column
-
1
<
prevWord
.
end
);
const
isInsideNextWord
=
(
nextWord
&&
nextWord
.
wordType
===
WordType
.
Regular
&&
nextWord
.
start
<
position
.
column
-
1
&&
position
.
column
-
1
<
nextWord
.
end
);
let
startColumn
:
number
;
let
endColumn
:
number
;
if
(
isInPrevWord
)
{
if
(
isIn
side
PrevWord
)
{
startColumn
=
prevWord
.
start
+
1
;
endColumn
=
prevWord
.
end
+
1
;
}
else
if
(
isInNextWord
)
{
}
else
if
(
isIn
side
NextWord
)
{
startColumn
=
nextWord
.
start
+
1
;
endColumn
=
nextWord
.
end
+
1
;
}
else
{
...
...
src/vs/editor/test/browser/controller/cursor.test.ts
浏览文件 @
9396ee52
...
...
@@ -1802,6 +1802,21 @@ suite('Editor Controller - Regression tests', () => {
model
.
dispose
();
});
test
(
'
issue #12887: Double-click highlighting separating white space
'
,
()
=>
{
let
model
=
createTextModel
(
[
'
abc def
'
].
join
(
'
\n
'
)
);
withTestCodeEditor
(
null
,
{
model
:
model
},
(
editor
,
cursor
)
=>
{
CoreNavigationCommands
.
WordSelect
.
runCoreEditorCommand
(
cursor
,
{
position
:
new
Position
(
1
,
5
)
});
assert
.
deepEqual
(
cursor
.
getSelection
(),
new
Selection
(
1
,
5
,
1
,
8
));
});
model
.
dispose
();
});
test
(
'
issue #9675: Undo/Redo adds a stop in between CHN Characters
'
,
()
=>
{
usingCursor
({
text
:
[
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录