Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
e43f0ce9
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,发现更多精彩内容 >>
提交
e43f0ce9
编写于
12月 29, 2015
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix issue with absolute paths and line/col information in path on windows for quick open
上级
d5592d58
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
20 addition
and
11 deletion
+20
-11
src/vs/workbench/parts/search/browser/openAnythingHandler.ts
src/vs/workbench/parts/search/browser/openAnythingHandler.ts
+20
-11
未找到文件。
src/vs/workbench/parts/search/browser/openAnythingHandler.ts
浏览文件 @
e43f0ce9
...
...
@@ -28,6 +28,11 @@ import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/c
import
{
ISearchConfiguration
}
from
'
vs/platform/search/common/search
'
;
import
{
IConfigurationService
,
IConfigurationServiceEvent
,
ConfigurationServiceEventTypes
}
from
'
vs/platform/configuration/common/configuration
'
;
interface
ISearchWithRange
{
search
:
string
;
range
:
IRange
;
}
export
class
OpenAnythingHandler
extends
QuickOpenHandler
{
private
static
LINE_COLON_PATTERN
=
/
[
#|:
](\d
*
)([
#|:
](\d
*
))?
$/
;
...
...
@@ -100,16 +105,13 @@ export class OpenAnythingHandler extends QuickOpenHandler {
}
// Find a suitable range from the pattern looking for ":" and "#"
let
range
=
this
.
findRange
(
searchValue
);
if
(
range
)
{
let
rangePrefix
=
searchValue
.
indexOf
(
'
#
'
)
>=
0
?
searchValue
.
indexOf
(
'
#
'
)
:
searchValue
.
indexOf
(
'
:
'
);
if
(
rangePrefix
>=
0
)
{
searchValue
=
searchValue
.
substring
(
0
,
rangePrefix
);
}
let
searchWithRange
=
this
.
extractRange
(
searchValue
);
if
(
searchWithRange
)
{
searchValue
=
searchWithRange
.
search
;
// ignore range portion in query
}
// Check Cache first
let
cachedResults
=
this
.
getResultsFromCache
(
searchValue
,
range
);
let
cachedResults
=
this
.
getResultsFromCache
(
searchValue
,
searchWithRange
?
searchWithRange
.
range
:
null
);
if
(
cachedResults
)
{
return
TPromise
.
as
(
new
QuickOpenModel
(
cachedResults
));
}
...
...
@@ -120,7 +122,7 @@ export class OpenAnythingHandler extends QuickOpenHandler {
// Symbol Results (unless a range is specified)
let
resultPromises
:
TPromise
<
QuickOpenModel
>
[]
=
[];
if
(
!
r
ange
)
{
if
(
!
searchWithR
ange
)
{
let
symbolSearchTimeoutPromiseFn
:
(
timeout
:
number
)
=>
Promise
=
(
timeout
)
=>
{
return
TPromise
.
timeout
(
timeout
).
then
(()
=>
{
...
...
@@ -172,7 +174,7 @@ export class OpenAnythingHandler extends QuickOpenHandler {
// Apply Range
result
.
forEach
((
element
)
=>
{
if
(
element
instanceof
FileEntry
)
{
(
<
FileEntry
>
element
).
setRange
(
range
);
(
<
FileEntry
>
element
).
setRange
(
searchWithRange
?
searchWithRange
.
range
:
null
);
}
});
...
...
@@ -195,7 +197,7 @@ export class OpenAnythingHandler extends QuickOpenHandler {
return
this
.
delayer
.
trigger
(
promiseFactory
);
}
private
findRange
(
value
:
string
):
I
Range
{
private
extractRange
(
value
:
string
):
ISearchWith
Range
{
let
range
:
IRange
=
null
;
// Find Line/Column number from search value using RegExp
...
...
@@ -233,7 +235,14 @@ export class OpenAnythingHandler extends QuickOpenHandler {
}
}
return
range
;
if
(
range
)
{
return
{
search
:
value
.
substr
(
0
,
patternMatch
.
index
),
// clear range suffix from search value
range
:
range
}
}
return
null
;
}
public
getResultsFromCache
(
searchValue
:
string
,
range
:
IRange
=
null
):
QuickOpenEntry
[]
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录