Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
1f0afd63
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,发现更多精彩内容 >>
提交
1f0afd63
编写于
9月 12, 2018
作者:
R
rebornix
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Re #27083. Find in selection should work even if the selection is a single line.
上级
f9c292f9
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
26 addition
and
4 deletion
+26
-4
src/vs/editor/contrib/find/findModel.ts
src/vs/editor/contrib/find/findModel.ts
+6
-2
src/vs/editor/contrib/find/findWidget.ts
src/vs/editor/contrib/find/findWidget.ts
+2
-2
src/vs/editor/contrib/find/test/findModel.test.ts
src/vs/editor/contrib/find/test/findModel.test.ts
+18
-0
未找到文件。
src/vs/editor/contrib/find/findModel.ts
浏览文件 @
1f0afd63
...
...
@@ -179,10 +179,14 @@ export class FindModelBoundToEditorModel {
}
if
(
findScope
!==
null
)
{
if
(
findScope
.
startLineNumber
!==
findScope
.
endLineNumber
)
{
if
(
findScope
.
endColumn
===
1
)
{
findScope
=
new
Range
(
findScope
.
startLineNumber
,
1
,
findScope
.
endLineNumber
-
1
,
this
.
_editor
.
getModel
().
getLineMaxColumn
(
findScope
.
endLineNumber
-
1
));
}
else
{
// multiline find scope => expand to line starts / ends
findScope
=
new
Range
(
findScope
.
startLineNumber
,
1
,
findScope
.
endLineNumber
,
this
.
_editor
.
getModel
().
getLineMaxColumn
(
findScope
.
endLineNumber
));
}
}
}
let
findMatches
=
this
.
_findMatches
(
findScope
,
false
,
MATCHES_LIMIT
);
this
.
_decorations
.
set
(
findMatches
,
findScope
);
...
...
src/vs/editor/contrib/find/findWidget.ts
浏览文件 @
1f0afd63
...
...
@@ -610,7 +610,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
if
(
this
.
_toggleSelectionFind
.
checked
)
{
let
selection
=
this
.
_codeEditor
.
getSelection
();
if
(
selection
.
endColumn
===
1
&&
selection
.
endLineNumber
>
selection
.
startLineNumber
)
{
selection
=
selection
.
setEndPosition
(
selection
.
endLineNumber
-
1
,
1
);
selection
=
selection
.
setEndPosition
(
selection
.
endLineNumber
-
1
,
this
.
_codeEditor
.
getModel
().
getLineMaxColumn
(
selection
.
endLineNumber
-
1
)
);
}
let
currentMatch
=
this
.
_state
.
currentMatch
;
if
(
selection
.
startLineNumber
!==
selection
.
endLineNumber
)
{
...
...
@@ -806,7 +806,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
if
(
this
.
_toggleSelectionFind
.
checked
)
{
let
selection
=
this
.
_codeEditor
.
getSelection
();
if
(
selection
.
endColumn
===
1
&&
selection
.
endLineNumber
>
selection
.
startLineNumber
)
{
selection
=
selection
.
setEndPosition
(
selection
.
endLineNumber
-
1
,
1
);
selection
=
selection
.
setEndPosition
(
selection
.
endLineNumber
-
1
,
this
.
_codeEditor
.
getModel
().
getLineMaxColumn
(
selection
.
endLineNumber
-
1
)
);
}
if
(
!
selection
.
isEmpty
())
{
this
.
_state
.
change
({
searchScope
:
selection
},
true
);
...
...
src/vs/editor/contrib/find/test/findModel.test.ts
浏览文件 @
1f0afd63
...
...
@@ -2031,4 +2031,22 @@ suite('FindModel', () => {
findModel
.
dispose
();
findState
.
dispose
();
});
findTest
(
'
issue #27083. search scope works even if it is a single line
'
,
(
editor
,
cursor
)
=>
{
let
findState
=
new
FindReplaceState
();
findState
.
change
({
searchString
:
'
hello
'
,
wholeWord
:
true
,
searchScope
:
new
Range
(
7
,
1
,
8
,
1
)
},
false
);
let
findModel
=
new
FindModelBoundToEditorModel
(
editor
,
findState
);
assertFindState
(
editor
,
[
1
,
1
,
1
,
1
],
null
,
[
[
7
,
14
,
7
,
19
]
]
);
findModel
.
dispose
();
findState
.
dispose
();
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录