Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
3b312976
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,发现更多精彩内容 >>
提交
3b312976
编写于
5月 04, 2016
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5715 from Inori/select_all_find_matches
Add selectAllMatches command in find widget.
上级
a3c2088b
aeb155d3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
71 addition
and
1 deletion
+71
-1
src/vs/editor/contrib/find/common/findController.ts
src/vs/editor/contrib/find/common/findController.ts
+12
-0
src/vs/editor/contrib/find/common/findModel.ts
src/vs/editor/contrib/find/common/findModel.ts
+16
-1
src/vs/editor/contrib/find/test/common/findModel.test.ts
src/vs/editor/contrib/find/test/common/findModel.test.ts
+43
-0
未找到文件。
src/vs/editor/contrib/find/common/findController.ts
浏览文件 @
3b312976
...
@@ -220,6 +220,15 @@ export class CommonFindController extends Disposable implements editorCommon.IEd
...
@@ -220,6 +220,15 @@ export class CommonFindController extends Disposable implements editorCommon.IEd
}
}
return
false
;
return
false
;
}
}
public
selectAllMatches
():
boolean
{
if
(
this
.
_model
)
{
this
.
_model
.
selectAllMatches
();
this
.
_editor
.
focus
();
return
true
;
}
return
false
;
}
}
}
export
class
StartFindAction
extends
EditorAction
{
export
class
StartFindAction
extends
EditorAction
{
...
@@ -726,3 +735,6 @@ registerFindCommand(FIND_IDS.ReplaceOneAction, x => x.replace(), {
...
@@ -726,3 +735,6 @@ registerFindCommand(FIND_IDS.ReplaceOneAction, x => x.replace(), {
registerFindCommand
(
FIND_IDS
.
ReplaceAllAction
,
x
=>
x
.
replaceAll
(),
{
registerFindCommand
(
FIND_IDS
.
ReplaceAllAction
,
x
=>
x
.
replaceAll
(),
{
primary
:
KeyMod
.
CtrlCmd
|
KeyMod
.
Alt
|
KeyCode
.
Enter
primary
:
KeyMod
.
CtrlCmd
|
KeyMod
.
Alt
|
KeyCode
.
Enter
});
});
registerFindCommand
(
FIND_IDS
.
SelectAllMatchesAction
,
x
=>
x
.
selectAllMatches
(),
{
primary
:
KeyMod
.
Alt
|
KeyCode
.
Enter
});
src/vs/editor/contrib/find/common/findModel.ts
浏览文件 @
3b312976
...
@@ -14,6 +14,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
...
@@ -14,6 +14,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
import
{
FindDecorations
}
from
'
./findDecorations
'
;
import
{
FindDecorations
}
from
'
./findDecorations
'
;
import
{
FindReplaceState
,
FindReplaceStateChangedEvent
}
from
'
./findState
'
;
import
{
FindReplaceState
,
FindReplaceStateChangedEvent
}
from
'
./findState
'
;
import
{
ReplaceAllCommand
}
from
'
./replaceAllCommand
'
;
import
{
ReplaceAllCommand
}
from
'
./replaceAllCommand
'
;
import
{
Selection
}
from
'
vs/editor/common/core/selection
'
;
export
const
FIND_IDS
=
{
export
const
FIND_IDS
=
{
StartFindAction
:
'
actions.find
'
,
StartFindAction
:
'
actions.find
'
,
...
@@ -29,7 +30,8 @@ export const FIND_IDS = {
...
@@ -29,7 +30,8 @@ export const FIND_IDS = {
ToggleWholeWordCommand
:
'
toggleFindWholeWord
'
,
ToggleWholeWordCommand
:
'
toggleFindWholeWord
'
,
ToggleRegexCommand
:
'
toggleFindRegex
'
,
ToggleRegexCommand
:
'
toggleFindRegex
'
,
ReplaceOneAction
:
'
editor.action.replaceOne
'
,
ReplaceOneAction
:
'
editor.action.replaceOne
'
,
ReplaceAllAction
:
'
editor.action.replaceAll
'
ReplaceAllAction
:
'
editor.action.replaceAll
'
,
SelectAllMatchesAction
:
'
editor.action.selectAllMatches
'
};
};
export
const
MATCHES_LIMIT
=
999
;
export
const
MATCHES_LIMIT
=
999
;
...
@@ -354,6 +356,19 @@ export class FindModelBoundToEditorModel {
...
@@ -354,6 +356,19 @@ export class FindModelBoundToEditorModel {
this
.
research
(
false
);
this
.
research
(
false
);
}
}
public
selectAllMatches
():
void
{
if
(
!
this
.
_hasMatches
())
{
return
;
}
let
findScope
=
this
.
_decorations
.
getFindScope
();
// Get all the ranges (even more than the highlighted ones)
let
ranges
=
this
.
_findMatches
(
findScope
,
Number
.
MAX_VALUE
);
this
.
_editor
.
setSelections
(
ranges
.
map
(
r
=>
new
Selection
(
r
.
startLineNumber
,
r
.
startColumn
,
r
.
endLineNumber
,
r
.
endColumn
)));
}
private
_executeEditorCommand
(
source
:
string
,
command
:
editorCommon
.
ICommand
):
void
{
private
_executeEditorCommand
(
source
:
string
,
command
:
editorCommon
.
ICommand
):
void
{
try
{
try
{
this
.
_ignoreModelContentChanged
=
true
;
this
.
_ignoreModelContentChanged
=
true
;
...
...
src/vs/editor/contrib/find/test/common/findModel.test.ts
浏览文件 @
3b312976
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
import
*
as
assert
from
'
assert
'
;
import
*
as
assert
from
'
assert
'
;
import
{
Cursor
}
from
'
vs/editor/common/controller/cursor
'
;
import
{
Cursor
}
from
'
vs/editor/common/controller/cursor
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
Handler
,
ICommonCodeEditor
,
IRange
}
from
'
vs/editor/common/editorCommon
'
;
import
{
Handler
,
ICommonCodeEditor
,
IRange
}
from
'
vs/editor/common/editorCommon
'
;
import
{
FindModelBoundToEditorModel
,
parseReplaceString
}
from
'
vs/editor/contrib/find/common/findModel
'
;
import
{
FindModelBoundToEditorModel
,
parseReplaceString
}
from
'
vs/editor/contrib/find/common/findModel
'
;
...
@@ -1395,6 +1396,48 @@ suite('FindModel', () => {
...
@@ -1395,6 +1396,48 @@ suite('FindModel', () => {
findState
.
dispose
();
findState
.
dispose
();
});
});
findTest
(
'
selectAllMatches
'
,
(
editor
,
cursor
)
=>
{
let
findState
=
new
FindReplaceState
();
findState
.
change
({
searchString
:
'
hello
'
,
replaceString
:
'
hi
'
,
wholeWord
:
true
},
false
);
let
findModel
=
new
FindModelBoundToEditorModel
(
editor
,
findState
);
assertFindState
(
editor
,
[
1
,
1
,
1
,
1
],
null
,
[
[
6
,
14
,
6
,
19
],
[
6
,
27
,
6
,
32
],
[
7
,
14
,
7
,
19
],
[
8
,
14
,
8
,
19
]
]
);
findModel
.
selectAllMatches
();
assert
.
deepEqual
(
editor
.
getSelections
().
map
(
s
=>
s
.
toString
()),
[
new
Selection
(
6
,
14
,
6
,
19
),
new
Selection
(
6
,
27
,
6
,
32
),
new
Selection
(
7
,
14
,
7
,
19
),
new
Selection
(
8
,
14
,
8
,
19
)
].
map
(
s
=>
s
.
toString
()));
assertFindState
(
editor
,
[
6
,
14
,
6
,
19
],
null
,
[
[
6
,
14
,
6
,
19
],
[
6
,
27
,
6
,
32
],
[
7
,
14
,
7
,
19
],
[
8
,
14
,
8
,
19
]
]
);
findModel
.
dispose
();
findState
.
dispose
();
});
findTest
(
'
issue #1914: NPE when there is only one find match
'
,
(
editor
,
cursor
)
=>
{
findTest
(
'
issue #1914: NPE when there is only one find match
'
,
(
editor
,
cursor
)
=>
{
let
findState
=
new
FindReplaceState
();
let
findState
=
new
FindReplaceState
();
findState
.
change
({
searchString
:
'
cool.h
'
},
false
);
findState
.
change
({
searchString
:
'
cool.h
'
},
false
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录