Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a1f97263
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,发现更多精彩内容 >>
提交
a1f97263
编写于
9月 19, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'roblou/findFilesUri'
上级
81562ab7
6326543b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
24 addition
and
11 deletion
+24
-11
src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
+3
-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
+5
-2
src/vs/workbench/api/node/extHostTypes.ts
src/vs/workbench/api/node/extHostTypes.ts
+9
-1
src/vs/workbench/api/node/extHostWorkspace.ts
src/vs/workbench/api/node/extHostWorkspace.ts
+6
-4
未找到文件。
src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
浏览文件 @
a1f97263
...
@@ -114,15 +114,15 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
...
@@ -114,15 +114,15 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
// --- search ---
// --- search ---
$startFileSearch
(
includePattern
:
string
,
includeFolder
:
string
,
excludePatternOrDisregardExcludes
:
string
|
false
,
maxResults
:
number
,
token
:
CancellationToken
):
Thenable
<
URI
[]
>
{
$startFileSearch
(
includePattern
:
string
,
includeFolder
:
URI
,
excludePatternOrDisregardExcludes
:
string
|
false
,
maxResults
:
number
,
token
:
CancellationToken
):
Thenable
<
URI
[]
>
{
const
workspace
=
this
.
_contextService
.
getWorkspace
();
const
workspace
=
this
.
_contextService
.
getWorkspace
();
if
(
!
workspace
.
folders
.
length
)
{
if
(
!
workspace
.
folders
.
length
)
{
return
undefined
;
return
undefined
;
}
}
let
folderQueries
:
IFolderQuery
[];
let
folderQueries
:
IFolderQuery
[];
if
(
typeof
includeFolder
===
'
string
'
)
{
if
(
includeFolder
)
{
folderQueries
=
[{
folder
:
URI
.
file
(
includeFolder
)
}];
// if base provided, only search in that folder
folderQueries
=
[{
folder
:
includeFolder
}];
// if base provided, only search in that folder
}
else
{
}
else
{
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
}
}
...
...
src/vs/workbench/api/node/extHost.protocol.ts
浏览文件 @
a1f97263
...
@@ -471,7 +471,7 @@ export interface ExtHostUrlsShape {
...
@@ -471,7 +471,7 @@ export interface ExtHostUrlsShape {
}
}
export
interface
MainThreadWorkspaceShape
extends
IDisposable
{
export
interface
MainThreadWorkspaceShape
extends
IDisposable
{
$startFileSearch
(
includePattern
:
string
,
includeFolder
:
string
,
excludePatternOrDisregardExcludes
:
string
|
false
,
maxResults
:
number
,
token
:
CancellationToken
):
Thenable
<
UriComponents
[]
>
;
$startFileSearch
(
includePattern
:
string
,
includeFolder
:
URI
,
excludePatternOrDisregardExcludes
:
string
|
false
,
maxResults
:
number
,
token
:
CancellationToken
):
Thenable
<
UriComponents
[]
>
;
$startTextSearch
(
query
:
IPatternInfo
,
options
:
IQueryOptions
,
requestId
:
number
,
token
:
CancellationToken
):
Thenable
<
vscode
.
TextSearchComplete
>
;
$startTextSearch
(
query
:
IPatternInfo
,
options
:
IQueryOptions
,
requestId
:
number
,
token
:
CancellationToken
):
Thenable
<
vscode
.
TextSearchComplete
>
;
$checkExists
(
includes
:
string
[],
token
:
CancellationToken
):
Thenable
<
boolean
>
;
$checkExists
(
includes
:
string
[],
token
:
CancellationToken
):
Thenable
<
boolean
>
;
$saveAll
(
includeUntitled
?:
boolean
):
Thenable
<
boolean
>
;
$saveAll
(
includeUntitled
?:
boolean
):
Thenable
<
boolean
>
;
...
...
src/vs/workbench/api/node/extHostTypeConverters.ts
浏览文件 @
a1f97263
...
@@ -19,7 +19,6 @@ import { IPosition } from 'vs/editor/common/core/position';
...
@@ -19,7 +19,6 @@ import { IPosition } from 'vs/editor/common/core/position';
import
{
IRange
}
from
'
vs/editor/common/core/range
'
;
import
{
IRange
}
from
'
vs/editor/common/core/range
'
;
import
{
ISelection
}
from
'
vs/editor/common/core/selection
'
;
import
{
ISelection
}
from
'
vs/editor/common/core/selection
'
;
import
*
as
htmlContent
from
'
vs/base/common/htmlContent
'
;
import
*
as
htmlContent
from
'
vs/base/common/htmlContent
'
;
import
{
IRelativePattern
}
from
'
vs/base/common/glob
'
;
import
*
as
languageSelector
from
'
vs/editor/common/modes/languageSelector
'
;
import
*
as
languageSelector
from
'
vs/editor/common/modes/languageSelector
'
;
import
{
WorkspaceEditDto
,
ResourceTextEditDto
,
ResourceFileEditDto
}
from
'
vs/workbench/api/node/extHost.protocol
'
;
import
{
WorkspaceEditDto
,
ResourceTextEditDto
,
ResourceFileEditDto
}
from
'
vs/workbench/api/node/extHost.protocol
'
;
import
{
MarkerSeverity
,
IRelatedInformation
,
IMarkerData
,
MarkerTag
}
from
'
vs/platform/markers/common/markers
'
;
import
{
MarkerSeverity
,
IRelatedInformation
,
IMarkerData
,
MarkerTag
}
from
'
vs/platform/markers/common/markers
'
;
...
@@ -744,7 +743,11 @@ export namespace TextEditorOptions {
...
@@ -744,7 +743,11 @@ export namespace TextEditorOptions {
export
namespace
GlobPattern
{
export
namespace
GlobPattern
{
export
function
from
(
pattern
:
vscode
.
GlobPattern
):
string
|
IRelativePattern
{
export
function
from
(
pattern
:
vscode
.
GlobPattern
):
string
|
types
.
RelativePattern
{
if
(
pattern
instanceof
types
.
RelativePattern
)
{
return
pattern
;
}
if
(
typeof
pattern
===
'
string
'
)
{
if
(
typeof
pattern
===
'
string
'
)
{
return
pattern
;
return
pattern
;
}
}
...
...
src/vs/workbench/api/node/extHostTypes.ts
浏览文件 @
a1f97263
...
@@ -1821,6 +1821,8 @@ export enum ConfigurationTarget {
...
@@ -1821,6 +1821,8 @@ export enum ConfigurationTarget {
export
class
RelativePattern
implements
IRelativePattern
{
export
class
RelativePattern
implements
IRelativePattern
{
base
:
string
;
base
:
string
;
baseFolder
?:
URI
;
pattern
:
string
;
pattern
:
string
;
constructor
(
base
:
vscode
.
WorkspaceFolder
|
string
,
pattern
:
string
)
{
constructor
(
base
:
vscode
.
WorkspaceFolder
|
string
,
pattern
:
string
)
{
...
@@ -1834,7 +1836,13 @@ export class RelativePattern implements IRelativePattern {
...
@@ -1834,7 +1836,13 @@ export class RelativePattern implements IRelativePattern {
throw
illegalArgument
(
'
pattern
'
);
throw
illegalArgument
(
'
pattern
'
);
}
}
this
.
base
=
typeof
base
===
'
string
'
?
base
:
base
.
uri
.
fsPath
;
if
(
typeof
base
===
'
string
'
)
{
this
.
base
=
base
;
}
else
{
this
.
baseFolder
=
base
.
uri
;
this
.
base
=
base
.
uri
.
fsPath
;
}
this
.
pattern
=
pattern
;
this
.
pattern
=
pattern
;
}
}
...
...
src/vs/workbench/api/node/extHostWorkspace.ts
浏览文件 @
a1f97263
...
@@ -20,7 +20,7 @@ import { ILogService } from 'vs/platform/log/common/log';
...
@@ -20,7 +20,7 @@ import { ILogService } from 'vs/platform/log/common/log';
import
{
Severity
}
from
'
vs/platform/notification/common/notification
'
;
import
{
Severity
}
from
'
vs/platform/notification/common/notification
'
;
import
{
IQueryOptions
,
IRawFileMatch2
}
from
'
vs/platform/search/common/search
'
;
import
{
IQueryOptions
,
IRawFileMatch2
}
from
'
vs/platform/search/common/search
'
;
import
{
Workspace
,
WorkspaceFolder
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
Workspace
,
WorkspaceFolder
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
Range
}
from
'
vs/workbench/api/node/extHostTypes
'
;
import
{
Range
,
RelativePattern
}
from
'
vs/workbench/api/node/extHostTypes
'
;
import
{
IExtensionDescription
}
from
'
vs/workbench/services/extensions/common/extensions
'
;
import
{
IExtensionDescription
}
from
'
vs/workbench/services/extensions/common/extensions
'
;
import
*
as
vscode
from
'
vscode
'
;
import
*
as
vscode
from
'
vscode
'
;
import
{
ExtHostWorkspaceShape
,
IMainContext
,
IWorkspaceData
,
MainContext
,
MainThreadMessageServiceShape
,
MainThreadWorkspaceShape
}
from
'
./extHost.protocol
'
;
import
{
ExtHostWorkspaceShape
,
IMainContext
,
IWorkspaceData
,
MainContext
,
MainThreadMessageServiceShape
,
MainThreadWorkspaceShape
}
from
'
./extHost.protocol
'
;
...
@@ -346,17 +346,19 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
...
@@ -346,17 +346,19 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
// --- search ---
// --- search ---
findFiles
(
include
:
vscode
.
Glob
Pattern
,
exclude
:
vscode
.
GlobPattern
,
maxResults
:
number
,
extensionId
:
string
,
token
:
vscode
.
CancellationToken
=
CancellationToken
.
None
):
Thenable
<
vscode
.
Uri
[]
>
{
findFiles
(
include
:
string
|
Relative
Pattern
,
exclude
:
vscode
.
GlobPattern
,
maxResults
:
number
,
extensionId
:
string
,
token
:
vscode
.
CancellationToken
=
CancellationToken
.
None
):
Thenable
<
vscode
.
Uri
[]
>
{
this
.
_logService
.
trace
(
`extHostWorkspace#findFiles: fileSearch, extension:
${
extensionId
}
, entryPoint: findFiles`
);
this
.
_logService
.
trace
(
`extHostWorkspace#findFiles: fileSearch, extension:
${
extensionId
}
, entryPoint: findFiles`
);
let
includePattern
:
string
;
let
includePattern
:
string
;
let
includeFolder
:
string
;
let
includeFolder
:
URI
;
if
(
include
)
{
if
(
include
)
{
if
(
typeof
include
===
'
string
'
)
{
if
(
typeof
include
===
'
string
'
)
{
includePattern
=
include
;
includePattern
=
include
;
}
else
{
}
else
{
includePattern
=
include
.
pattern
;
includePattern
=
include
.
pattern
;
includeFolder
=
include
.
base
;
// include.base must be an absolute path
includeFolder
=
include
.
baseFolder
||
URI
.
file
(
include
.
base
);
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录