Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
7003dfec
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,发现更多精彩内容 >>
提交
7003dfec
编写于
10月 03, 2018
作者:
Š
Šimon Koníček
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixing TypeInferrer crash with `return` or `yield return` as a global statement
上级
638f14d8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
25 addition
and
7 deletion
+25
-7
src/EditorFeatures/CSharpTest/TypeInferrer/TypeInferrerTests.cs
...itorFeatures/CSharpTest/TypeInferrer/TypeInferrerTests.cs
+14
-0
src/EditorFeatures/TestUtilities/TypeInferrer/TypeInferrerTestBase.cs
...atures/TestUtilities/TypeInferrer/TypeInferrerTestBase.cs
+8
-6
src/Workspaces/CSharp/Portable/LanguageServices/CSharpTypeInferenceService.TypeInferrer.cs
...nguageServices/CSharpTypeInferenceService.TypeInferrer.cs
+3
-1
未找到文件。
src/EditorFeatures/CSharpTest/TypeInferrer/TypeInferrerTests.cs
浏览文件 @
7003dfec
...
...
@@ -1096,6 +1096,13 @@ IEnumerable<int> F()
await
TestAsync
(
markup
,
"global::System.Int32"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
TypeInferenceService
)]
public
async
Task
TestYieldReturnAsGlobalStatement
()
{
await
TestAsync
(
@"yield return [|abc|]"
,
"global::System.Object"
,
sourceCodeKind
:
SourceCodeKind
.
Script
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
TypeInferenceService
)]
public
async
Task
TestReturnInSimpleLambda
()
{
...
...
@@ -1219,6 +1226,13 @@ public async Task TestReturnInAsyncVoidAnonymousMethod()
};"
,
"void"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
TypeInferenceService
)]
public
async
Task
TestReturnAsGlobalStatement
()
{
await
TestAsync
(
@"return [|Goo()|];"
,
"global::System.Object"
,
sourceCodeKind
:
SourceCodeKind
.
Script
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
TypeInferenceService
)]
public
async
Task
TestSimpleLambda
()
{
...
...
src/EditorFeatures/TestUtilities/TypeInferrer/TypeInferrerTestBase.cs
浏览文件 @
7003dfec
...
...
@@ -37,18 +37,19 @@ private static async Task<bool> CanUseSpeculativeSemanticModelAsync(Document doc
return
!
service
.
GetMemberBodySpanForSpeculativeBinding
(
node
).
IsEmpty
;
}
protected
async
Task
TestAsync
(
string
text
,
string
expectedType
,
bool
testNode
=
true
,
bool
testPosition
=
true
)
protected
async
Task
TestAsync
(
string
text
,
string
expectedType
,
bool
testNode
=
true
,
bool
testPosition
=
true
,
SourceCodeKind
sourceCodeKind
=
SourceCodeKind
.
Regular
)
{
MarkupTestFile
.
GetSpan
(
text
.
NormalizeLineEndings
(),
out
text
,
out
var
textSpan
);
if
(
testNode
)
{
await
TestWithAndWithoutSpeculativeSemanticModelAsync
(
text
,
textSpan
,
expectedType
,
useNodeStartPosition
:
false
);
await
TestWithAndWithoutSpeculativeSemanticModelAsync
(
text
,
textSpan
,
expectedType
,
useNodeStartPosition
:
false
,
sourceCodeKind
);
}
if
(
testPosition
)
{
await
TestWithAndWithoutSpeculativeSemanticModelAsync
(
text
,
textSpan
,
expectedType
,
useNodeStartPosition
:
true
);
await
TestWithAndWithoutSpeculativeSemanticModelAsync
(
text
,
textSpan
,
expectedType
,
useNodeStartPosition
:
true
,
sourceCodeKind
);
}
}
...
...
@@ -56,14 +57,15 @@ protected async Task TestAsync(string text, string expectedType, bool testNode =
string
text
,
TextSpan
textSpan
,
string
expectedType
,
bool
useNodeStartPosition
)
bool
useNodeStartPosition
,
SourceCodeKind
sourceCodeKind
)
{
var
document
=
fixture
.
UpdateDocument
(
text
,
SourceCodeKind
.
Regular
);
var
document
=
fixture
.
UpdateDocument
(
text
,
sourceCodeKind
);
await
TestWorkerAsync
(
document
,
textSpan
,
expectedType
,
useNodeStartPosition
);
if
(
await
CanUseSpeculativeSemanticModelAsync
(
document
,
textSpan
.
Start
))
{
var
document2
=
fixture
.
UpdateDocument
(
text
,
SourceCodeKind
.
Regular
,
cleanBeforeUpdate
:
false
);
var
document2
=
fixture
.
UpdateDocument
(
text
,
sourceCodeKind
,
cleanBeforeUpdate
:
false
);
await
TestWorkerAsync
(
document2
,
textSpan
,
expectedType
,
useNodeStartPosition
);
}
}
...
...
src/Workspaces/CSharp/Portable/LanguageServices/CSharpTypeInferenceService.TypeInferrer.cs
浏览文件 @
7003dfec
...
...
@@ -1869,7 +1869,9 @@ private ISymbol GetDeclaredMemberSymbolFromOriginalSemanticModel(SyntaxNode decl
return
originalSemanticModel
.
GetDeclaredSymbol
(
declaration
,
CancellationToken
);
}
return
currentSemanticModel
.
GetDeclaredSymbol
(
declarationInCurrentTree
,
CancellationToken
);
return
declarationInCurrentTree
!=
null
?
currentSemanticModel
.
GetDeclaredSymbol
(
declarationInCurrentTree
,
CancellationToken
)
:
null
;
}
private
IEnumerable
<
TypeInferenceInfo
>
InferTypeInSwitchLabel
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录