Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2e6578fc
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,发现更多精彩内容 >>
提交
2e6578fc
编写于
12月 14, 2017
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
native json for exthost/mainthread-workspace, #40169
上级
e20f08b2
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
18 addition
and
9 deletion
+18
-9
src/vs/workbench/api/node/extHost.protocol.ts
src/vs/workbench/api/node/extHost.protocol.ts
+3
-4
src/vs/workbench/api/node/extHostWorkspace.ts
src/vs/workbench/api/node/extHostWorkspace.ts
+12
-3
src/vs/workbench/node/extensionHostMain.ts
src/vs/workbench/node/extensionHostMain.ts
+3
-2
未找到文件。
src/vs/workbench/api/node/extHost.protocol.ts
浏览文件 @
2e6578fc
...
...
@@ -48,7 +48,6 @@ import { ITreeItem } from 'vs/workbench/common/views';
import
{
ThemeColor
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
SerializedError
}
from
'
vs/base/common/errors
'
;
import
{
IWorkspaceFolderData
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IStat
,
IFileChange
}
from
'
vs/platform/files/common/files
'
;
import
{
ConfigurationScope
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
ParsedArgs
}
from
'
vs/platform/environment/common/environment
'
;
...
...
@@ -68,7 +67,7 @@ export interface IEnvironment {
export
interface
IWorkspaceData
{
id
:
string
;
name
:
string
;
folders
:
IWorkspaceFolderData
[];
folders
:
{
uri
:
UriComponents
,
name
:
string
,
index
:
number
}
[];
}
export
interface
IInitData
{
...
...
@@ -686,7 +685,7 @@ export const MainContext = {
MainThreadStorage
:
createMainId
<
MainThreadStorageShape
>
(
'
MainThreadStorage
'
),
MainThreadTelemetry
:
createMainId
<
MainThreadTelemetryShape
>
(
'
MainThreadTelemetry
'
),
MainThreadTerminalService
:
createMainId
<
MainThreadTerminalServiceShape
>
(
'
MainThreadTerminalService
'
),
MainThreadWorkspace
:
createMainId
<
MainThreadWorkspaceShape
>
(
'
MainThreadWorkspace
'
,
ProxyType
.
CustomMarshaller
),
MainThreadWorkspace
:
createMainId
<
MainThreadWorkspaceShape
>
(
'
MainThreadWorkspace
'
),
MainThreadFileSystem
:
createMainId
<
MainThreadFileSystemShape
>
(
'
MainThreadFileSystem
'
),
MainThreadExtensionService
:
createMainId
<
MainThreadExtensionServiceShape
>
(
'
MainThreadExtensionService
'
),
MainThreadSCM
:
createMainId
<
MainThreadSCMShape
>
(
'
MainThreadSCM
'
,
ProxyType
.
CustomMarshaller
),
...
...
@@ -715,6 +714,6 @@ export const ExtHostContext = {
ExtHostTerminalService
:
createExtId
<
ExtHostTerminalServiceShape
>
(
'
ExtHostTerminalService
'
),
ExtHostSCM
:
createExtId
<
ExtHostSCMShape
>
(
'
ExtHostSCM
'
,
ProxyType
.
CustomMarshaller
),
ExtHostTask
:
createExtId
<
ExtHostTaskShape
>
(
'
ExtHostTask
'
,
ProxyType
.
CustomMarshaller
),
ExtHostWorkspace
:
createExtId
<
ExtHostWorkspaceShape
>
(
'
ExtHostWorkspace
'
,
ProxyType
.
CustomMarshaller
),
ExtHostWorkspace
:
createExtId
<
ExtHostWorkspaceShape
>
(
'
ExtHostWorkspace
'
),
ExtHostWindow
:
createExtId
<
ExtHostWindowShape
>
(
'
ExtHostWindow
'
),
};
src/vs/workbench/api/node/extHostWorkspace.ts
浏览文件 @
2e6578fc
...
...
@@ -18,14 +18,23 @@ import { TernarySearchTree } from 'vs/base/common/map';
class
Workspace2
extends
Workspace
{
static
fromData
(
data
:
IWorkspaceData
)
{
return
data
?
new
Workspace2
(
data
)
:
null
;
if
(
!
data
)
{
return
null
;
}
else
{
const
{
id
,
name
,
folders
}
=
data
;
return
new
Workspace2
(
id
,
name
,
folders
.
map
(({
uri
,
name
,
index
})
=>
new
WorkspaceFolder
({
name
,
index
,
uri
:
URI
.
revive
(
uri
)
}))
);
}
}
private
readonly
_workspaceFolders
:
vscode
.
WorkspaceFolder
[]
=
[];
private
readonly
_structure
=
TernarySearchTree
.
forPaths
<
vscode
.
WorkspaceFolder
>
();
private
constructor
(
data
:
IWorkspaceData
)
{
super
(
data
.
id
,
data
.
name
,
data
.
folders
.
map
(
folder
=>
new
WorkspaceFolder
(
folder
))
);
private
constructor
(
id
:
string
,
name
:
string
,
folders
:
WorkspaceFolder
[]
)
{
super
(
id
,
name
,
folders
);
// setup the workspace folder data structure
this
.
folders
.
forEach
(({
name
,
uri
,
index
})
=>
{
...
...
src/vs/workbench/node/extensionHostMain.ts
浏览文件 @
2e6578fc
...
...
@@ -26,6 +26,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
IMessagePassingProtocol
}
from
'
vs/base/parts/ipc/common/ipc
'
;
import
{
RPCProtocol
}
from
'
vs/workbench/services/extensions/node/rpcProtocol
'
;
import
URI
from
'
vs/base/common/uri
'
;
// const nativeExit = process.exit.bind(process);
function
patchProcess
(
allowExit
:
boolean
)
{
...
...
@@ -234,7 +235,7 @@ export class ExtensionHostMain {
// find exact path
for
(
const
{
uri
}
of
this
.
_workspace
.
folders
)
{
if
(
await
pfs
.
exists
(
join
(
uri
.
fsPath
,
fileName
)))
{
if
(
await
pfs
.
exists
(
join
(
URI
.
revive
(
uri
)
.
fsPath
,
fileName
)))
{
// the file was found
return
(
this
.
_extensionService
.
activateById
(
extensionId
,
new
ExtensionActivatedByEvent
(
true
,
`workspaceContains:
${
fileName
}
`
))
...
...
@@ -261,7 +262,7 @@ export class ExtensionHostMain {
includes
[
globPattern
]
=
true
;
});
const
folderQueries
=
this
.
_workspace
.
folders
.
map
(
folder
=>
({
folder
:
folder
.
uri
}));
const
folderQueries
=
this
.
_workspace
.
folders
.
map
(
folder
=>
({
folder
:
URI
.
revive
(
folder
.
uri
)
}));
const
config
=
this
.
_extHostConfiguration
.
getConfiguration
(
'
search
'
);
const
useRipgrep
=
config
.
get
(
'
useRipgrep
'
,
true
);
const
followSymlinks
=
config
.
get
(
'
followSymlinks
'
,
true
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录