Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
de3ec3dd
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,发现更多精彩内容 >>
未验证
提交
de3ec3dd
编写于
2月 21, 2019
作者:
A
Alexandru Dima
提交者:
GitHub
2月 21, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #69131 from Microsoft/sandy081/fixDeadlock
fix dead lock
上级
d8599708
26d204ad
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
3 deletion
+7
-3
src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
+1
-1
src/vs/workbench/api/node/extHostExtensionService.ts
src/vs/workbench/api/node/extHostExtensionService.ts
+6
-2
未找到文件。
src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
浏览文件 @
de3ec3dd
...
...
@@ -44,7 +44,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
@
ILabelService
private
readonly
_labelService
:
ILabelService
)
{
this
.
_proxy
=
extHostContext
.
getProxy
(
ExtHostContext
.
ExtHostWorkspace
);
this
.
_
proxy
.
$initializeWorkspace
(
this
.
getWorkspaceData
(
this
.
_contextService
.
getWorkspace
(
)));
this
.
_
contextService
.
getCompleteWorkspace
().
then
(
workspace
=>
this
.
_proxy
.
$initializeWorkspace
(
this
.
getWorkspaceData
(
workspace
)));
this
.
_contextService
.
onDidChangeWorkspaceFolders
(
this
.
_onDidChangeWorkspace
,
this
,
this
.
_toDispose
);
this
.
_contextService
.
onDidChangeWorkbenchState
(
this
.
_onDidChangeWorkspace
,
this
,
this
.
_toDispose
);
}
...
...
src/vs/workbench/api/node/extHostExtensionService.ts
浏览文件 @
de3ec3dd
...
...
@@ -161,6 +161,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
private
readonly
_mainThreadTelemetryProxy
:
MainThreadTelemetryShape
;
private
readonly
_mainThreadExtensionsProxy
:
MainThreadExtensionServiceShape
;
private
readonly
_almostReadyToRunExtensions
:
Barrier
;
private
readonly
_barrier
:
Barrier
;
private
readonly
_registry
:
ExtensionDescriptionRegistry
;
private
readonly
_storage
:
ExtHostStorage
;
...
...
@@ -192,6 +193,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
this
.
_mainThreadTelemetryProxy
=
this
.
_extHostContext
.
getProxy
(
MainContext
.
MainThreadTelemetry
);
this
.
_mainThreadExtensionsProxy
=
this
.
_extHostContext
.
getProxy
(
MainContext
.
MainThreadExtensionService
);
this
.
_almostReadyToRunExtensions
=
new
Barrier
();
this
.
_barrier
=
new
Barrier
();
this
.
_registry
=
new
ExtensionDescriptionRegistry
(
initData
.
extensions
);
this
.
_storage
=
new
ExtHostStorage
(
this
.
_extHostContext
);
...
...
@@ -245,10 +247,12 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
private
async
_initialize
():
Promise
<
void
>
{
try
{
const
configProvider
=
await
this
.
_extHostConfiguration
.
getConfigProvider
();
await
this
.
_extHostWorkspace
.
waitForInitializeCall
();
await
initializeExtensionApi
(
this
,
this
.
_extensionApiFactory
,
this
.
_registry
,
configProvider
);
// Do this when extension service exists, but extensions are not being activated yet.
await
connectProxyResolver
(
this
.
_extHostWorkspace
,
configProvider
,
this
,
this
.
_extHostLogService
,
this
.
_mainThreadTelemetryProxy
);
this
.
_almostReadyToRunExtensions
.
open
();
await
this
.
_extHostWorkspace
.
waitForInitializeCall
();
this
.
_barrier
.
open
();
}
catch
(
err
)
{
errors
.
onUnexpectedError
(
err
);
...
...
@@ -683,7 +687,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
}
const
authorityPrefix
=
remoteAuthority
.
substr
(
0
,
authorityPlusIndex
);
await
this
.
_
barrier
.
wait
();
await
this
.
_
almostReadyToRunExtensions
.
wait
();
await
this
.
_activateByEvent
(
`onResolveRemoteAuthority:
${
authorityPrefix
}
`
,
false
);
const
resolver
=
this
.
_resolvers
[
authorityPrefix
];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录