Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
33d78684
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,发现更多精彩内容 >>
提交
33d78684
编写于
2月 18, 2015
作者:
T
Tomas Matousek
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #653 from tmat/master
Use ReportFatalError in TaskFactory helpers
上级
ae7ca813
0a4b9174
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
30 deletion
+29
-30
src/Workspaces/Core/Portable/Utilities/TaskExtensions.cs
src/Workspaces/Core/Portable/Utilities/TaskExtensions.cs
+10
-7
src/Workspaces/Core/Portable/Utilities/TaskFactoryExtensions.cs
...rkspaces/Core/Portable/Utilities/TaskFactoryExtensions.cs
+2
-14
src/Workspaces/Core/Portable/Workspace/Solution/DocumentState.cs
...kspaces/Core/Portable/Workspace/Solution/DocumentState.cs
+17
-9
未找到文件。
src/Workspaces/Core/Portable/Utilities/TaskExtensions.cs
浏览文件 @
33d78684
...
...
@@ -303,12 +303,7 @@ public static T WaitAndGetResult<T>(this Task<T> task, CancellationToken cancell
// the behavior we want.
// This is the only place in the code where we're allowed to call ContinueWith.
var
nextTask
=
task
.
ContinueWith
(
continuationFunction
,
cancellationToken
,
continuationOptions
|
TaskContinuationOptions
.
LazyCancellation
,
scheduler
).
Unwrap
();
nextTask
.
ContinueWith
(
ReportFatalError
,
continuationFunction
,
CancellationToken
.
None
,
TaskContinuationOptions
.
OnlyOnFaulted
|
TaskContinuationOptions
.
ExecuteSynchronously
,
TaskScheduler
.
Default
);
ReportFatalError
(
nextTask
,
continuationFunction
);
return
nextTask
;
}
...
...
@@ -340,8 +335,16 @@ public static T WaitAndGetResult<T>(this Task<T> task, CancellationToken cancell
cancellationToken
,
taskContinuationOptions
,
scheduler
).
Unwrap
();
}
internal
static
void
ReportFatalError
(
Task
task
,
object
continuationFunction
)
{
task
.
ContinueWith
(
ReportFatalErrorWorker
,
continuationFunction
,
CancellationToken
.
None
,
TaskContinuationOptions
.
OnlyOnFaulted
|
TaskContinuationOptions
.
ExecuteSynchronously
,
TaskScheduler
.
Default
);
}
[
MethodImpl
(
MethodImplOptions
.
NoOptimization
|
MethodImplOptions
.
NoInlining
)]
private
static
void
ReportFatalError
(
Task
task
,
object
continuationFunction
)
private
static
void
ReportFatalError
Worker
(
Task
task
,
object
continuationFunction
)
{
var
exception
=
task
.
Exception
;
var
methodInfo
=
((
Delegate
)
continuationFunction
).
GetMethodInfo
();
...
...
src/Workspaces/Core/Portable/Utilities/TaskFactoryExtensions.cs
浏览文件 @
33d78684
...
...
@@ -81,13 +81,7 @@ public static Task SafeStartNewFromAsync(this TaskFactory factory, Func<Task> ac
{
// The one and only place we can call StartNew<>().
var
task
=
factory
.
StartNew
(
actionAsync
,
cancellationToken
,
creationOptions
,
scheduler
).
Unwrap
();
// make it crash if exception has thrown
task
.
ContinueWith
(
t
=>
FatalError
.
Report
(
t
.
Exception
),
CancellationToken
.
None
,
TaskContinuationOptions
.
OnlyOnFaulted
|
TaskContinuationOptions
.
ExecuteSynchronously
,
TaskScheduler
.
Default
);
TaskExtensions
.
ReportFatalError
(
task
,
actionAsync
);
return
task
;
}
...
...
@@ -105,13 +99,7 @@ public static Task<TResult> SafeStartNewFromAsync<TResult>(this TaskFactory fact
{
// The one and only place we can call StartNew<>().
var
task
=
factory
.
StartNew
(
funcAsync
,
cancellationToken
,
creationOptions
,
scheduler
).
Unwrap
();
// make it crash if exception has thrown
task
.
ContinueWith
(
t
=>
FatalError
.
Report
(
t
.
Exception
),
CancellationToken
.
None
,
TaskContinuationOptions
.
OnlyOnFaulted
|
TaskContinuationOptions
.
ExecuteSynchronously
,
TaskScheduler
.
Default
);
TaskExtensions
.
ReportFatalError
(
task
,
funcAsync
);
return
task
;
}
}
...
...
src/Workspaces/Core/Portable/Workspace/Solution/DocumentState.cs
浏览文件 @
33d78684
...
...
@@ -7,6 +7,7 @@
using
System.Text
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis.ErrorReporting
;
using
Microsoft.CodeAnalysis.Host
;
using
Microsoft.CodeAnalysis.Internal.Log
;
using
Microsoft.CodeAnalysis.LanguageServices
;
...
...
@@ -134,19 +135,26 @@ private static string GetSyntaxTreeFilePath(DocumentInfo info)
ValueSource
<
TextAndVersion
>
newTextSource
,
CancellationToken
cancellationToken
)
{
using
(
Logger
.
LogBlock
(
FunctionId
.
Workspace_Document_State_IncrementallyParseSyntaxTree
,
cancellationToken
))
try
{
var
newTextAndVersion
=
await
newTextSource
.
GetValueAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
var
newText
=
newTextAndVersion
.
Text
;
using
(
Logger
.
LogBlock
(
FunctionId
.
Workspace_Document_State_IncrementallyParseSyntaxTree
,
cancellationToken
))
{
var
newTextAndVersion
=
await
newTextSource
.
GetValueAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
var
newText
=
newTextAndVersion
.
Text
;
var
oldTreeAndVersion
=
await
oldTreeSource
.
GetValueAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
var
oldTree
=
oldTreeAndVersion
.
Tree
;
var
oldText
=
await
oldTree
.
GetTextAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
var
oldTreeAndVersion
=
await
oldTreeSource
.
GetValueAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
var
oldTree
=
oldTreeAndVersion
.
Tree
;
var
oldText
=
await
oldTree
.
GetTextAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
var
newTree
=
oldTree
.
WithChangedText
(
newText
);
Contract
.
ThrowIfNull
(
newTree
);
var
newTree
=
oldTree
.
WithChangedText
(
newText
);
Contract
.
ThrowIfNull
(
newTree
);
return
MakeNewTreeAndVersion
(
oldTree
,
oldText
,
oldTreeAndVersion
.
Version
,
newTree
,
newText
,
newTextAndVersion
.
Version
);
return
MakeNewTreeAndVersion
(
oldTree
,
oldText
,
oldTreeAndVersion
.
Version
,
newTree
,
newText
,
newTextAndVersion
.
Version
);
}
}
catch
(
Exception
e
)
when
(
FatalError
.
ReportUnlessCanceled
(
e
))
{
throw
ExceptionUtilities
.
Unreachable
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录