Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
fd2370e8
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,发现更多精彩内容 >>
提交
fd2370e8
编写于
6月 20, 2017
作者:
H
Heejae Chang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
some more rename
上级
6f3b54f3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
14 deletion
+14
-14
src/EditorFeatures/TestUtilities/Remote/InProcRemostHostClient.cs
...orFeatures/TestUtilities/Remote/InProcRemostHostClient.cs
+1
-1
src/VisualStudio/Core/Next/Remote/JsonRpcConnection.cs
src/VisualStudio/Core/Next/Remote/JsonRpcConnection.cs
+12
-12
src/VisualStudio/Core/Next/Remote/ServiceHubRemoteHostClient.cs
...sualStudio/Core/Next/Remote/ServiceHubRemoteHostClient.cs
+1
-1
未找到文件。
src/EditorFeatures/TestUtilities/Remote/InProcRemostHostClient.cs
浏览文件 @
fd2370e8
...
@@ -72,7 +72,7 @@ public static async Task<RemoteHostClient> CreateAsync(Workspace workspace, bool
...
@@ -72,7 +72,7 @@ public static async Task<RemoteHostClient> CreateAsync(Workspace workspace, bool
// this is what consumer actually use to communicate information
// this is what consumer actually use to communicate information
var
serviceStream
=
await
_inprocServices
.
RequestServiceAsync
(
serviceName
,
cancellationToken
).
ConfigureAwait
(
false
);
var
serviceStream
=
await
_inprocServices
.
RequestServiceAsync
(
serviceName
,
cancellationToken
).
ConfigureAwait
(
false
);
return
new
ServiceHub
JsonRpcConnection
(
callbackTarget
,
serviceStream
,
_remotableDataRpc
.
Share
(),
cancellationToken
);
return
new
JsonRpcConnection
(
callbackTarget
,
serviceStream
,
_remotableDataRpc
.
Share
(),
cancellationToken
);
}
}
protected
override
void
OnStarted
()
protected
override
void
OnStarted
()
...
...
src/VisualStudio/Core/Next/Remote/JsonRpcConnection.cs
浏览文件 @
fd2370e8
...
@@ -10,10 +10,10 @@
...
@@ -10,10 +10,10 @@
namespace
Microsoft.VisualStudio.LanguageServices.Remote
namespace
Microsoft.VisualStudio.LanguageServices.Remote
{
{
internal
class
ServiceHub
JsonRpcConnection
:
RemoteHostClient
.
Connection
internal
class
JsonRpcConnection
:
RemoteHostClient
.
Connection
{
{
// communication channel related to service information
// communication channel related to service information
private
readonly
ServiceJsonRpc
Client
_serviceClient
;
private
readonly
ServiceJsonRpc
Ex
_serviceRpc
;
// communication channel related to snapshot information
// communication channel related to snapshot information
private
readonly
RemotableDataJsonRpcEx
_remoteDataRpc
;
private
readonly
RemotableDataJsonRpcEx
_remoteDataRpc
;
...
@@ -21,14 +21,14 @@ internal class ServiceHubJsonRpcConnection : RemoteHostClient.Connection
...
@@ -21,14 +21,14 @@ internal class ServiceHubJsonRpcConnection : RemoteHostClient.Connection
// close connection when cancellation has raised
// close connection when cancellation has raised
private
readonly
CancellationTokenRegistration
_cancellationRegistration
;
private
readonly
CancellationTokenRegistration
_cancellationRegistration
;
public
ServiceHub
JsonRpcConnection
(
public
JsonRpcConnection
(
object
callbackTarget
,
object
callbackTarget
,
Stream
serviceStream
,
Stream
serviceStream
,
RemotableDataJsonRpcEx
dataRpc
,
RemotableDataJsonRpcEx
dataRpc
,
CancellationToken
cancellationToken
)
:
CancellationToken
cancellationToken
)
:
base
(
cancellationToken
)
base
(
cancellationToken
)
{
{
_service
Client
=
new
ServiceJsonRpcClient
(
serviceStream
,
callbackTarget
,
cancellationToken
);
_service
Rpc
=
new
ServiceJsonRpcEx
(
serviceStream
,
callbackTarget
,
cancellationToken
);
_remoteDataRpc
=
dataRpc
;
_remoteDataRpc
=
dataRpc
;
// dispose session when cancellation has raised
// dispose session when cancellation has raised
...
@@ -37,27 +37,27 @@ internal class ServiceHubJsonRpcConnection : RemoteHostClient.Connection
...
@@ -37,27 +37,27 @@ internal class ServiceHubJsonRpcConnection : RemoteHostClient.Connection
protected
override
async
Task
OnRegisterPinnedRemotableDataScopeAsync
(
PinnedRemotableDataScope
scope
)
protected
override
async
Task
OnRegisterPinnedRemotableDataScopeAsync
(
PinnedRemotableDataScope
scope
)
{
{
await
_service
Client
.
InvokeAsync
(
WellKnownServiceHubServices
.
ServiceHubServiceBase_Initialize
,
scope
.
SolutionInfo
).
ConfigureAwait
(
false
);
await
_service
Rpc
.
InvokeAsync
(
WellKnownServiceHubServices
.
ServiceHubServiceBase_Initialize
,
scope
.
SolutionInfo
).
ConfigureAwait
(
false
);
}
}
public
override
Task
InvokeAsync
(
string
targetName
,
params
object
[]
arguments
)
public
override
Task
InvokeAsync
(
string
targetName
,
params
object
[]
arguments
)
{
{
return
_service
Client
.
InvokeAsync
(
targetName
,
arguments
);
return
_service
Rpc
.
InvokeAsync
(
targetName
,
arguments
);
}
}
public
override
Task
<
T
>
InvokeAsync
<
T
>(
string
targetName
,
params
object
[]
arguments
)
public
override
Task
<
T
>
InvokeAsync
<
T
>(
string
targetName
,
params
object
[]
arguments
)
{
{
return
_service
Client
.
InvokeAsync
<
T
>(
targetName
,
arguments
);
return
_service
Rpc
.
InvokeAsync
<
T
>(
targetName
,
arguments
);
}
}
public
override
Task
InvokeAsync
(
string
targetName
,
IEnumerable
<
object
>
arguments
,
Func
<
Stream
,
CancellationToken
,
Task
>
funcWithDirectStreamAsync
)
public
override
Task
InvokeAsync
(
string
targetName
,
IEnumerable
<
object
>
arguments
,
Func
<
Stream
,
CancellationToken
,
Task
>
funcWithDirectStreamAsync
)
{
{
return
_service
Client
.
InvokeAsync
(
targetName
,
arguments
,
funcWithDirectStreamAsync
);
return
_service
Rpc
.
InvokeAsync
(
targetName
,
arguments
,
funcWithDirectStreamAsync
);
}
}
public
override
Task
<
T
>
InvokeAsync
<
T
>(
string
targetName
,
IEnumerable
<
object
>
arguments
,
Func
<
Stream
,
CancellationToken
,
Task
<
T
>>
funcWithDirectStreamAsync
)
public
override
Task
<
T
>
InvokeAsync
<
T
>(
string
targetName
,
IEnumerable
<
object
>
arguments
,
Func
<
Stream
,
CancellationToken
,
Task
<
T
>>
funcWithDirectStreamAsync
)
{
{
return
_service
Client
.
InvokeAsync
<
T
>(
targetName
,
arguments
,
funcWithDirectStreamAsync
);
return
_service
Rpc
.
InvokeAsync
<
T
>(
targetName
,
arguments
,
funcWithDirectStreamAsync
);
}
}
protected
override
void
OnDisposed
()
protected
override
void
OnDisposed
()
...
@@ -68,7 +68,7 @@ protected override void OnDisposed()
...
@@ -68,7 +68,7 @@ protected override void OnDisposed()
_cancellationRegistration
.
Dispose
();
_cancellationRegistration
.
Dispose
();
// dispose service and snapshot channels
// dispose service and snapshot channels
_service
Client
.
Dispose
();
_service
Rpc
.
Dispose
();
_remoteDataRpc
.
Dispose
();
_remoteDataRpc
.
Dispose
();
}
}
...
@@ -77,11 +77,11 @@ protected override void OnDisposed()
...
@@ -77,11 +77,11 @@ protected override void OnDisposed()
///
///
/// this is the channel consumer of remote host client will playing with
/// this is the channel consumer of remote host client will playing with
/// </summary>
/// </summary>
private
class
ServiceJsonRpc
Client
:
JsonRpcEx
private
class
ServiceJsonRpc
Ex
:
JsonRpcEx
{
{
private
readonly
object
_callbackTarget
;
private
readonly
object
_callbackTarget
;
public
ServiceJsonRpc
Client
(
Stream
stream
,
object
callbackTarget
,
CancellationToken
cancellationToken
)
public
ServiceJsonRpc
Ex
(
Stream
stream
,
object
callbackTarget
,
CancellationToken
cancellationToken
)
:
base
(
stream
,
callbackTarget
,
useThisAsCallback
:
false
,
cancellationToken
:
cancellationToken
)
:
base
(
stream
,
callbackTarget
,
useThisAsCallback
:
false
,
cancellationToken
:
cancellationToken
)
{
{
// this one doesn't need cancellation token since it has nothing to cancel
// this one doesn't need cancellation token since it has nothing to cancel
...
...
src/VisualStudio/Core/Next/Remote/ServiceHubRemoteHostClient.cs
浏览文件 @
fd2370e8
...
@@ -127,7 +127,7 @@ public override async Task<Connection> TryCreateConnectionAsync(string serviceNa
...
@@ -127,7 +127,7 @@ public override async Task<Connection> TryCreateConnectionAsync(string serviceNa
// this is what consumer actually use to communicate information
// this is what consumer actually use to communicate information
var
serviceStream
=
await
RequestServiceAsync
(
_hubClient
,
serviceName
,
_hostGroup
,
_timeout
,
cancellationToken
).
ConfigureAwait
(
false
);
var
serviceStream
=
await
RequestServiceAsync
(
_hubClient
,
serviceName
,
_hostGroup
,
_timeout
,
cancellationToken
).
ConfigureAwait
(
false
);
return
new
ServiceHub
JsonRpcConnection
(
callbackTarget
,
serviceStream
,
_remotableDataRpc
.
Share
(),
cancellationToken
);
return
new
JsonRpcConnection
(
callbackTarget
,
serviceStream
,
_remotableDataRpc
.
Share
(),
cancellationToken
);
}
}
protected
override
void
OnStarted
()
protected
override
void
OnStarted
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录