Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
011c6c90
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
011c6c90
编写于
7月 18, 2019
作者:
D
David Barbet
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Initialize IOptionPersister on the UI thread for liveshare.
上级
b2b2d973
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
26 addition
and
1 deletion
+26
-1
src/Tools/ExternalAccess/LiveShare/RemoteLanguageServiceWorkspaceHost.cs
...nalAccess/LiveShare/RemoteLanguageServiceWorkspaceHost.cs
+26
-1
未找到文件。
src/Tools/ExternalAccess/LiveShare/RemoteLanguageServiceWorkspaceHost.cs
浏览文件 @
011c6c90
...
...
@@ -6,8 +6,13 @@
using
System.Linq
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis.Editor.Shared.Utilities
;
using
Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Projects
;
using
Microsoft.CodeAnalysis.Options
;
using
Microsoft.VisualStudio.ComponentModelHost
;
using
Microsoft.VisualStudio.LanguageServices.Implementation.Options
;
using
Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem
;
using
Microsoft.VisualStudio.LanguageServices.Setup
;
using
Microsoft.VisualStudio.LiveShare
;
using
Microsoft.VisualStudio.Shell
;
using
Microsoft.VisualStudio.Threading
;
...
...
@@ -37,6 +42,7 @@ internal sealed class RemoteLanguageServiceWorkspaceHost : ICollaborationService
// TODO: remove this project language to extension map with the switch to LSP
private
readonly
ImmutableDictionary
<
string
,
string
[
]>
_projectLanguageToExtensionMap
;
private
readonly
SVsServiceProvider
_serviceProvider
;
private
readonly
IThreadingContext
_threadingContext
;
public
Workspace
Workspace
=>
_remoteLanguageServiceWorkspace
;
...
...
@@ -47,11 +53,13 @@ internal sealed class RemoteLanguageServiceWorkspaceHost : ICollaborationService
[
ImportingConstructor
]
public
RemoteLanguageServiceWorkspaceHost
(
RemoteLanguageServiceWorkspace
remoteLanguageServiceWorkspace
,
RemoteProjectInfoProvider
remoteProjectInfoProvider
,
SVsServiceProvider
serviceProvider
)
SVsServiceProvider
serviceProvider
,
IThreadingContext
threadingContext
)
{
_remoteLanguageServiceWorkspace
=
Requires
.
NotNull
(
remoteLanguageServiceWorkspace
,
nameof
(
remoteLanguageServiceWorkspace
));
_remoteProjectInfoProvider
=
Requires
.
NotNull
(
remoteProjectInfoProvider
,
nameof
(
remoteProjectInfoProvider
));
_serviceProvider
=
serviceProvider
??
throw
new
ArgumentNullException
(
nameof
(
serviceProvider
));
_threadingContext
=
Requires
.
NotNull
(
threadingContext
,
nameof
(
threadingContext
));
var
builder
=
ImmutableDictionary
.
CreateBuilder
<
string
,
string
[
]>
(
StringComparer
.
OrdinalIgnoreCase
);
builder
.
Add
(
"TypeScript"
,
new
string
[]
{
".js"
,
".jsx"
,
".ts"
,
".tsx"
});
...
...
@@ -62,6 +70,8 @@ internal sealed class RemoteLanguageServiceWorkspaceHost : ICollaborationService
public
async
Task
<
ICollaborationService
>
CreateServiceAsync
(
CollaborationSession
collaborationSession
,
CancellationToken
cancellationToken
)
{
await
_remoteLanguageServiceWorkspace
.
SetSession
(
collaborationSession
).
ConfigureAwait
(
false
);
await
InitOptionsAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
_remoteLanguageServiceWorkspace
.
Init
();
// Kick off loading the projects in the background.
...
...
@@ -111,6 +121,21 @@ public async Task EnsureProjectsLoadedAsync(CancellationToken cancellationToken)
}
}
/// <summary>
/// Initialize the options. This must be done on the UI thread because
/// multiple <see cref="IOptionPersister"/> are required to be initialized on the UI thread.
/// Typically this is done by <see cref="RoslynPackage"/> but this is not to guaranteed
/// to procede liveshare initialization.
/// TODO - https://github.com/dotnet/roslyn/issues/37377
/// </summary>
private
async
Task
InitOptionsAsync
(
CancellationToken
cancellationToken
)
{
await
_threadingContext
.
JoinableTaskFactory
.
SwitchToMainThreadAsync
(
cancellationToken
);
var
componentModel
=
(
IComponentModel
)
_serviceProvider
.
GetService
(
typeof
(
SComponentModel
));
// Ensure the options persisters are loaded since we have to fetch options from the shell
componentModel
.
GetExtensions
<
IOptionPersister
>();
}
/// <summary>
/// Loads (or reloads) the corresponding Roslyn project and the direct referenced projects in the host environment.
/// </summary>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录