Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
7f1f2d2d
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,发现更多精彩内容 >>
提交
7f1f2d2d
编写于
2月 25, 2016
作者:
T
Tomáš Matoušek
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #9193 from tmat/StackFormatterRegression
Fix regression in interactive stack printing
上级
663a4fa7
31b600d9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
38 addition
and
3 deletion
+38
-3
src/Interactive/Features/Interactive/Core/InteractiveHost.Service.cs
...tive/Features/Interactive/Core/InteractiveHost.Service.cs
+1
-1
src/Scripting/CSharpTest/ObjectFormatterTests.cs
src/Scripting/CSharpTest/ObjectFormatterTests.cs
+32
-0
src/Scripting/Core/Hosting/CommonMemberFilter.cs
src/Scripting/Core/Hosting/CommonMemberFilter.cs
+5
-2
未找到文件。
src/Interactive/Features/Interactive/Core/InteractiveHost.Service.cs
浏览文件 @
7f1f2d2d
...
...
@@ -820,7 +820,7 @@ private async Task<ScriptState<object>> ExecuteOnUIThread(Script<object> script,
}
catch
(
Exception
e
)
{
Console
.
Error
.
Write
Line
(
_replServiceProvider
.
ObjectFormatter
.
FormatException
(
e
));
Console
.
Error
.
Write
(
_replServiceProvider
.
ObjectFormatter
.
FormatException
(
e
));
return
null
;
}
}))).
ConfigureAwait
(
false
);
...
...
src/Scripting/CSharpTest/ObjectFormatterTests.cs
浏览文件 @
7f1f2d2d
...
...
@@ -906,6 +906,38 @@ public void StackTrace_GenericMethodInGenericType()
$@"Exception of type 'System.Exception' was thrown.
+ Microsoft.CodeAnalysis.CSharp.Scripting.Hosting.UnitTests.ObjectFormatterTests.Fixture<T>.Method<U>()
{
string
.
Format
(
ScriptingResources
.
AtFileLine
,
filePath
,
10027
)}
+ Microsoft.CodeAnalysis.CSharp.Scripting.Hosting.UnitTests.ObjectFormatterTests.StackTrace_GenericMethodInGenericType()
{
string
.
Format
(
ScriptingResources
.
AtFileLine
,
filePath
,
10101
)}
"
;
var
actual
=
s_formatter
.
FormatException
(
e
);
Assert
.
Equal
(
expected
,
actual
);
}
}
private
static
class
Fixture2
{
[
MethodImpl
(
MethodImplOptions
.
NoInlining
)]
public
static
void
MethodDynamic
()
{
((
dynamic
)
new
object
()).
x
();
}
}
[
Fact
]
public
void
StackTrace_Dynamic
()
{
try
{
Fixture2
.
MethodDynamic
();
Assert
.
False
(
true
);
}
catch
(
Exception
e
)
{
const
string
filePath
=
@"z:\Fixture.cs"
;
var
expected
=
$@"'object' does not contain a definition for 'x'
+ System.Dynamic.UpdateDelegates.UpdateAndExecuteVoid1<T0>(System.Runtime.CompilerServices.CallSite, T0)
+ Microsoft.CodeAnalysis.CSharp.Scripting.Hosting.UnitTests.ObjectFormatterTests.Fixture2.MethodDynamic()
{
string
.
Format
(
ScriptingResources
.
AtFileLine
,
filePath
,
10123
)}
+ Microsoft.CodeAnalysis.CSharp.Scripting.Hosting.UnitTests.ObjectFormatterTests.StackTrace_Dynamic()
{
string
.
Format
(
ScriptingResources
.
AtFileLine
,
filePath
,
10132
)}
"
;
var
actual
=
s_formatter
.
FormatException
(
e
);
Assert
.
Equal
(
expected
,
actual
);
...
...
src/Scripting/Core/Hosting/CommonMemberFilter.cs
浏览文件 @
7f1f2d2d
...
...
@@ -26,8 +26,9 @@ public override bool Include(StackFrame frame)
return
false
;
}
// Type is null for DynamicMethods and global methods.
// TODO (tomat): we don't want to include awaiter helpers, shouldn't they be marked by DebuggerHidden in FX?
if
(
IsTaskAwaiter
(
type
)
||
IsTaskAwaiter
(
type
.
DeclaringType
))
if
(
type
==
null
||
IsTaskAwaiter
(
type
)
||
IsTaskAwaiter
(
type
.
DeclaringType
))
{
return
false
;
}
...
...
@@ -44,8 +45,10 @@ private bool IsHiddenMember(MemberInfo info)
{
while
(
info
!=
null
)
{
// GetCustomAttributes returns null when called on DynamicMethod
// (bug https://github.com/dotnet/corefx/issues/6402)
if
(
IsGeneratedMemberName
(
info
.
Name
)
||
info
.
GetCustomAttributes
<
DebuggerHiddenAttribute
>()
.
Any
()
)
info
.
GetCustomAttributes
<
DebuggerHiddenAttribute
>()
?.
Any
()
==
true
)
{
return
true
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录