Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
3299f026
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,发现更多精彩内容 >>
提交
3299f026
编写于
3月 28, 2016
作者:
J
Jason Malinowski
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #10128 from vslsnap/merge-stabilization-into-master20160326-150026
Merge stabilization into master
上级
a42fae6f
0ecf683e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
127 addition
and
2 deletion
+127
-2
src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs
...atures/CSharpTest/EditAndContinue/ActiveStatementTests.cs
+70
-0
src/EditorFeatures/VisualBasicTest/EditAndContinue/ActiveStatementTests.vb
...s/VisualBasicTest/EditAndContinue/ActiveStatementTests.vb
+54
-0
src/Features/Core/Portable/EditAndContinue/AbstractEditAndContinueAnalyzer.cs
...rtable/EditAndContinue/AbstractEditAndContinueAnalyzer.cs
+3
-2
未找到文件。
src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs
浏览文件 @
3299f026
...
...
@@ -7856,6 +7856,76 @@ static async void F()
edits
.
VerifyRudeDiagnostics
(
active
);
}
[
Fact
]
public
void
AsyncMethodEdit_Semantics
()
{
string
src1
=
@"
using System;
using System.Threading.Tasks;
class C
{
static async Task<int> F()
{
Console.WriteLine(1);
return await Task.FromResult(1);
}
}
"
;
string
src2
=
@"
using System;
using System.Threading.Tasks;
class C
{
static async Task<int> F()
{
Console.WriteLine(2);
return await Task.FromResult(1);
}
}
"
;
var
edits
=
GetTopEdits
(
src1
,
src2
);
var
active
=
GetActiveStatements
(
src1
,
src2
);
edits
.
VerifySemanticDiagnostics
();
}
[
Fact
]
public
void
IteratorMethodEdit_Semantics
()
{
string
src1
=
@"
using System;
using System.Collections.Generic;
class C
{
static IEnumerable<int> F()
{
Console.WriteLine(1);
yield return 1;
}
}
"
;
string
src2
=
@"
using System;
using System.Collections.Generic;
class C
{
static IEnumerable<int> F()
{
Console.WriteLine(2);
yield return 2;
}
}
"
;
var
edits
=
GetTopEdits
(
src1
,
src2
);
var
active
=
GetActiveStatements
(
src1
,
src2
);
edits
.
VerifySemanticDiagnostics
();
}
#
endregion
#
region
Misplaced
AS
...
...
src/EditorFeatures/VisualBasicTest/EditAndContinue/ActiveStatementTests.vb
浏览文件 @
3299f026
...
...
@@ -5143,6 +5143,60 @@ End Class
edits
.
VerifyRudeDiagnostics
(
active
)
End
Sub
<
Fact
>
Public
Sub
AsyncMethodEdit_Semantics
()
Dim
src1
=
"
Imports System
Imports System.Threading.Tasks
Class C
Async Function F() As Task(Of Integer)
Console.WriteLine(1)
Await Task.FromResult(1)
End Function
End Class
"
Dim
src2
=
"
Imports System
Imports System.Threading.Tasks
Class C
Async Function F() As Task(Of Integer)
Console.WriteLine(2)
Await Task.FromResult(1)
End Function
End Class
"
Dim
edits
=
GetTopEdits
(
src1
,
src2
)
edits
.
VerifySemanticDiagnostics
()
End
Sub
<
Fact
>
Public
Sub
IteratorMethodEdit_Semantics
()
Dim
src1
=
"
Imports System
Imports System.Collections.Generic
Class C
Iterator Function F() As IEnumerable(Of Integer)
Console.WriteLine(1)
Yield 1
End Function
End Class
"
Dim
src2
=
"
Imports System
Imports System.Collections.Generic
Class C
Iterator Function F() As IEnumerable(Of Integer)
Console.WriteLine(2)
Yield 1
End Function
End Class
"
Dim
edits
=
GetTopEdits
(
src1
,
src2
)
edits
.
VerifySemanticDiagnostics
()
End
Sub
#End Region
#Region "On Error"
...
...
src/Features/Core/Portable/EditAndContinue/AbstractEditAndContinueAnalyzer.cs
浏览文件 @
3299f026
...
...
@@ -2312,7 +2312,7 @@ public ConstructorEdit(INamedTypeSymbol oldType)
{
var
updatedMember
=
updatedMembers
[
updatedMemberIndex
];
ReportStateMachineRudeEdits
(
updatedMember
,
oldSymbol
,
diagnostics
);
ReportStateMachineRudeEdits
(
oldModel
.
Compilation
,
updatedMember
,
oldSymbol
,
diagnostics
);
bool
newBodyHasLambdas
;
ReportLambdaAndClosureRudeEdits
(
...
...
@@ -3703,6 +3703,7 @@ private bool AreEquivalentClosureScopes(SyntaxNode oldScopeOpt, SyntaxNode newSc
#
region
State
Machines
private
void
ReportStateMachineRudeEdits
(
Compilation
oldCompilation
,
UpdatedMemberInfo
updatedInfo
,
ISymbol
oldMember
,
List
<
RudeEditDiagnostic
>
diagnostics
)
...
...
@@ -3719,7 +3720,7 @@ private bool AreEquivalentClosureScopes(SyntaxNode oldScopeOpt, SyntaxNode newSc
// We assume that the attributes, if exist, are well formed.
// If not an error will be reported during EnC delta emit.
if
(
old
Member
.
ContainingAssembly
.
GetTypeByMetadataName
(
stateMachineAttributeQualifiedName
)
==
null
)
if
(
old
Compilation
.
GetTypeByMetadataName
(
stateMachineAttributeQualifiedName
)
==
null
)
{
diagnostics
.
Add
(
new
RudeEditDiagnostic
(
RudeEditKind
.
UpdatingStateMachineMethodMissingAttribute
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录