Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
118169f3
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,发现更多精彩内容 >>
提交
118169f3
编写于
11月 14, 2017
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Cannot read property '0' of undefined (fixes #38190)
上级
9f5dbc26
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
3 deletion
+7
-3
src/vs/base/common/glob.ts
src/vs/base/common/glob.ts
+1
-1
src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
+6
-2
未找到文件。
src/vs/base/common/glob.ts
浏览文件 @
118169f3
...
@@ -482,7 +482,7 @@ export function parse(arg1: string | IExpression | IRelativePattern, options: IG
...
@@ -482,7 +482,7 @@ export function parse(arg1: string | IExpression | IRelativePattern, options: IG
return
parsedExpression
(
<
IExpression
>
arg1
,
options
);
return
parsedExpression
(
<
IExpression
>
arg1
,
options
);
}
}
function
isRelativePattern
(
obj
:
any
):
obj
is
IRelativePattern
{
export
function
isRelativePattern
(
obj
:
any
):
obj
is
IRelativePattern
{
const
rp
=
obj
as
IRelativePattern
;
const
rp
=
obj
as
IRelativePattern
;
return
typeof
rp
.
base
===
'
string
'
&&
typeof
rp
.
pattern
===
'
string
'
;
return
typeof
rp
.
base
===
'
string
'
&&
typeof
rp
.
pattern
===
'
string
'
;
...
...
src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
浏览文件 @
118169f3
...
@@ -14,7 +14,7 @@ import { MainThreadWorkspaceShape, ExtHostWorkspaceShape, ExtHostContext, MainCo
...
@@ -14,7 +14,7 @@ import { MainThreadWorkspaceShape, ExtHostWorkspaceShape, ExtHostContext, MainCo
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
extHostNamedCustomer
}
from
'
vs/workbench/api/electron-browser/extHostCustomers
'
;
import
{
extHostNamedCustomer
}
from
'
vs/workbench/api/electron-browser/extHostCustomers
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IRelativePattern
}
from
'
vs/base/common/glob
'
;
import
{
IRelativePattern
,
isRelativePattern
}
from
'
vs/base/common/glob
'
;
@
extHostNamedCustomer
(
MainContext
.
MainThreadWorkspace
)
@
extHostNamedCustomer
(
MainContext
.
MainThreadWorkspace
)
export
class
MainThreadWorkspace
implements
MainThreadWorkspaceShape
{
export
class
MainThreadWorkspace
implements
MainThreadWorkspaceShape
{
...
@@ -61,10 +61,14 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
...
@@ -61,10 +61,14 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
let
folderQueries
:
IFolderQuery
[];
let
folderQueries
:
IFolderQuery
[];
if
(
typeof
include
===
'
string
'
||
!
include
)
{
if
(
typeof
include
===
'
string
'
||
!
include
)
{
folderQueries
=
workspace
.
folders
.
map
(
folder
=>
({
folder
:
folder
.
uri
}));
// absolute pattern: search across all folders
folderQueries
=
workspace
.
folders
.
map
(
folder
=>
({
folder
:
folder
.
uri
}));
// absolute pattern: search across all folders
}
else
{
}
else
if
(
isRelativePattern
(
include
))
{
folderQueries
=
[{
folder
:
URI
.
file
(
include
.
base
)
}];
// relative pattern: search only in base folder
folderQueries
=
[{
folder
:
URI
.
file
(
include
.
base
)
}];
// relative pattern: search only in base folder
}
}
if
(
!
folderQueries
)
{
return
undefined
;
// invalid query parameters
}
const
useRipgrep
=
folderQueries
.
every
(
folderQuery
=>
{
const
useRipgrep
=
folderQueries
.
every
(
folderQuery
=>
{
const
folderConfig
=
this
.
_configurationService
.
getValue
<
ISearchConfiguration
>
({
resource
:
folderQuery
.
folder
});
const
folderConfig
=
this
.
_configurationService
.
getValue
<
ISearchConfiguration
>
({
resource
:
folderQuery
.
folder
});
return
folderConfig
.
search
.
useRipgrep
;
return
folderConfig
.
search
.
useRipgrep
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录