Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c0a5a09a
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,发现更多精彩内容 >>
提交
c0a5a09a
编写于
1月 29, 2018
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #33528
上级
b338f57e
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
18 addition
and
14 deletion
+18
-14
src/vs/vscode.d.ts
src/vs/vscode.d.ts
+3
-2
src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
+4
-3
src/vs/workbench/api/node/extHost.protocol.ts
src/vs/workbench/api/node/extHost.protocol.ts
+1
-1
src/vs/workbench/api/node/extHostTypeConverters.ts
src/vs/workbench/api/node/extHostTypeConverters.ts
+3
-3
src/vs/workbench/api/node/extHostWorkspace.ts
src/vs/workbench/api/node/extHostWorkspace.ts
+7
-5
未找到文件。
src/vs/vscode.d.ts
浏览文件 @
c0a5a09a
...
...
@@ -5495,13 +5495,14 @@ declare module 'vscode' {
* will be matched against the file paths of resulting matches relative to their workspace. Use a [relative pattern](#RelativePattern)
* to restrict the search results to a [workspace folder](#WorkspaceFolder).
* @param exclude A [glob pattern](#GlobPattern) that defines files and folders to exclude. The glob pattern
* will be matched against the file paths of resulting matches relative to their workspace.
* will be matched against the file paths of resulting matches relative to their workspace. When `undefined` only default excludes will
* apply, when `null` no excludes will apply.
* @param maxResults An upper-bound for the result.
* @param token A token that can be used to signal cancellation to the underlying search engine.
* @return A thenable that resolves to an array of resource identifiers. Will return no results if no
* [workspace folders](#workspace.workspaceFolders) are opened.
*/
export
function
findFiles
(
include
:
GlobPattern
,
exclude
?:
GlobPattern
,
maxResults
?:
number
,
token
?:
CancellationToken
):
Thenable
<
Uri
[]
>
;
export
function
findFiles
(
include
:
GlobPattern
,
exclude
?:
GlobPattern
|
null
,
maxResults
?:
number
,
token
?:
CancellationToken
):
Thenable
<
Uri
[]
>
;
/**
* Save all dirty files.
...
...
src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
浏览文件 @
c0a5a09a
...
...
@@ -97,7 +97,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
// --- search ---
$startSearch
(
includePattern
:
string
,
includeFolder
:
string
,
excludePattern
:
string
,
maxResults
:
number
,
requestId
:
number
):
Thenable
<
URI
[]
>
{
$startSearch
(
includePattern
:
string
,
includeFolder
:
string
,
excludePattern
OrDisregardExcludes
:
string
|
false
,
maxResults
:
number
,
requestId
:
number
):
Thenable
<
URI
[]
>
{
const
workspace
=
this
.
_contextService
.
getWorkspace
();
if
(
!
workspace
.
folders
.
length
)
{
return
undefined
;
...
...
@@ -129,7 +129,8 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
type
:
QueryType
.
File
,
maxResults
,
includePattern
:
{
[
typeof
includePattern
===
'
string
'
?
includePattern
:
undefined
]:
true
},
excludePattern
:
{
[
typeof
excludePattern
===
'
string
'
?
excludePattern
:
undefined
]:
true
},
excludePattern
:
{
[
typeof
excludePatternOrDisregardExcludes
===
'
string
'
?
excludePatternOrDisregardExcludes
:
undefined
]:
true
},
disregardExcludeSettings
:
excludePatternOrDisregardExcludes
===
false
,
useRipgrep
,
ignoreSymlinks
};
...
...
src/vs/workbench/api/node/extHost.protocol.ts
浏览文件 @
c0a5a09a
...
...
@@ -346,7 +346,7 @@ export interface MainThreadTelemetryShape extends IDisposable {
}
export
interface
MainThreadWorkspaceShape
extends
IDisposable
{
$startSearch
(
includePattern
:
string
,
includeFolder
:
string
,
excludePattern
:
string
,
maxResults
:
number
,
requestId
:
number
):
Thenable
<
UriComponents
[]
>
;
$startSearch
(
includePattern
:
string
,
includeFolder
:
string
,
excludePattern
OrDisregardExcludes
:
string
|
false
,
maxResults
:
number
,
requestId
:
number
):
Thenable
<
UriComponents
[]
>
;
$cancelSearch
(
requestId
:
number
):
Thenable
<
boolean
>
;
$saveAll
(
includeUntitled
?:
boolean
):
Thenable
<
boolean
>
;
$updateWorkspaceFolders
(
extensionName
:
string
,
index
:
number
,
deleteCount
:
number
,
workspaceFoldersToAdd
:
{
uri
:
UriComponents
,
name
?:
string
}[]):
Thenable
<
void
>
;
...
...
src/vs/workbench/api/node/extHostTypeConverters.ts
浏览文件 @
c0a5a09a
...
...
@@ -603,11 +603,11 @@ export function toGlobPattern(pattern: vscode.GlobPattern): string | IRelativePa
return
pattern
;
}
if
(
!
isRelativePattern
(
pattern
))
{
return
undefined
;
if
(
isRelativePattern
(
pattern
))
{
return
new
types
.
RelativePattern
(
pattern
.
base
,
pattern
.
pattern
)
;
}
return
new
types
.
RelativePattern
(
pattern
.
base
,
pattern
.
pattern
);
return
pattern
;
// preserve `undefined` and `null`
}
function
isRelativePattern
(
obj
:
any
):
obj
is
vscode
.
RelativePattern
{
...
...
src/vs/workbench/api/node/extHostWorkspace.ts
浏览文件 @
c0a5a09a
...
...
@@ -331,16 +331,18 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
}
}
let
excludePattern
:
string
;
if
(
exclude
)
{
let
excludePatternOrDisregardExcludes
:
string
|
false
;
if
(
exclude
===
null
)
{
excludePatternOrDisregardExcludes
=
false
;
}
else
if
(
exclude
)
{
if
(
typeof
exclude
===
'
string
'
)
{
excludePattern
=
exclude
;
excludePattern
OrDisregardExcludes
=
exclude
;
}
else
{
excludePattern
=
exclude
.
pattern
;
excludePattern
OrDisregardExcludes
=
exclude
.
pattern
;
}
}
const
result
=
this
.
_proxy
.
$startSearch
(
includePattern
,
includeFolder
,
excludePattern
,
maxResults
,
requestId
);
const
result
=
this
.
_proxy
.
$startSearch
(
includePattern
,
includeFolder
,
excludePattern
OrDisregardExcludes
,
maxResults
,
requestId
);
if
(
token
)
{
token
.
onCancellationRequested
(()
=>
this
.
_proxy
.
$cancelSearch
(
requestId
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录