Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
4014d838
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,发现更多精彩内容 >>
提交
4014d838
编写于
5月 06, 2016
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #6149: Escape selected text used to seed search input when regex toggle is on
上级
586e60d0
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
35 addition
and
2 deletion
+35
-2
src/vs/editor/contrib/find/common/findController.ts
src/vs/editor/contrib/find/common/findController.ts
+6
-1
src/vs/editor/contrib/find/test/common/findController.test.ts
...vs/editor/contrib/find/test/common/findController.test.ts
+29
-1
未找到文件。
src/vs/editor/contrib/find/common/findController.ts
浏览文件 @
4014d838
...
...
@@ -13,6 +13,7 @@ import {Range} from 'vs/editor/common/core/range';
import
{
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
EditorAction
}
from
'
vs/editor/common/editorAction
'
;
import
{
Behaviour
}
from
'
vs/editor/common/editorActionEnablement
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
*
as
editorCommon
from
'
vs/editor/common/editorCommon
'
;
import
{
CommonEditorRegistry
,
ContextKey
,
EditorActionDescriptor
}
from
'
vs/editor/common/editorCommonExtensions
'
;
import
{
FIND_IDS
,
FindModelBoundToEditorModel
}
from
'
vs/editor/contrib/find/common/findModel
'
;
...
...
@@ -161,9 +162,13 @@ export class CommonFindController extends Disposable implements editorCommon.IEd
if
(
opts
.
seedSearchStringFromSelection
)
{
let
selectionSearchString
=
this
.
getSelectionSearchString
();
if
(
selectionSearchString
)
{
if
(
this
.
_state
.
isRegex
)
{
stateChanges
.
searchString
=
strings
.
escapeRegExpCharacters
(
selectionSearchString
);
}
else
{
stateChanges
.
searchString
=
selectionSearchString
;
}
}
}
let
selection
=
this
.
_editor
.
getSelection
();
...
...
src/vs/editor/contrib/find/test/common/findController.test.ts
浏览文件 @
4014d838
...
...
@@ -7,6 +7,7 @@
import
*
as
assert
from
'
assert
'
;
import
{
EditOperation
}
from
'
vs/editor/common/core/editOperation
'
;
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
{
IRange
}
from
'
vs/editor/common/editorCommon
'
;
import
{
CommonFindController
,
FindStartFocusAction
,
IFindStartOptions
,
NextMatchFindAction
,
StartFindAction
}
from
'
vs/editor/contrib/find/common/findController
'
;
...
...
@@ -94,7 +95,6 @@ suite('FindController', () => {
'
import nls = require(
\'
vs/nls
\'
);
'
],
{},
(
editor
,
cursor
)
=>
{
// The cursor is at the very top, of the file, at the first ABC
let
findController
=
editor
.
registerAndInstantiateContribution
<
TestFindController
>
(
TestFindController
);
let
nextMatchFindAction
=
new
NextMatchFindAction
({
id
:
''
,
label
:
''
},
editor
);
...
...
@@ -113,4 +113,32 @@ suite('FindController', () => {
nextMatchFindAction
.
dispose
();
});
});
test
(
'
issue #6149: Auto-escape highlighted text for search and replace regex mode
'
,
()
=>
{
withMockCodeEditor
([
'
var x = (3 * 5)
'
,
'
var y = (3 * 5)
'
,
'
var z = (3 * 5)
'
,
],
{},
(
editor
,
cursor
)
=>
{
let
findController
=
editor
.
registerAndInstantiateContribution
<
TestFindController
>
(
TestFindController
);
let
startFindAction
=
new
StartFindAction
({
id
:
''
,
label
:
''
},
editor
);
let
nextMatchFindAction
=
new
NextMatchFindAction
({
id
:
''
,
label
:
''
},
editor
);
editor
.
setSelection
(
new
Selection
(
1
,
9
,
1
,
13
));
findController
.
toggleRegex
();
startFindAction
.
run
();
nextMatchFindAction
.
run
();
assert
.
deepEqual
(
fromRange
(
editor
.
getSelection
()),
[
2
,
9
,
2
,
13
]);
nextMatchFindAction
.
run
();
assert
.
deepEqual
(
fromRange
(
editor
.
getSelection
()),
[
1
,
9
,
1
,
13
]);
findController
.
dispose
();
startFindAction
.
dispose
();
nextMatchFindAction
.
dispose
();
});
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录