Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
d500d521
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,发现更多精彩内容 >>
提交
d500d521
编写于
7月 31, 2017
作者:
G
Gen Lu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Expose receiver for static event assignemt
上级
0e0e4efd
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
79 addition
and
6 deletion
+79
-6
src/Compilers/CSharp/Portable/Operations/CSharpOperationFactory.cs
...lers/CSharp/Portable/Operations/CSharpOperationFactory.cs
+1
-1
src/Compilers/CSharp/Test/Semantic/IOperation/IOperationTests_IEventAssignmentExpression.cs
.../IOperation/IOperationTests_IEventAssignmentExpression.cs
+43
-0
src/Compilers/VisualBasic/Portable/Operations/VisualBasicOperationFactory.vb
...lBasic/Portable/Operations/VisualBasicOperationFactory.vb
+1
-5
src/Compilers/VisualBasic/Test/Semantic/IOperation/IOperationTests_IEventAssignmentExpression.vb
.../IOperation/IOperationTests_IEventAssignmentExpression.vb
+34
-0
未找到文件。
src/Compilers/CSharp/Portable/Operations/CSharpOperationFactory.cs
浏览文件 @
d500d521
...
...
@@ -365,7 +365,7 @@ private IEventAssignmentExpression CreateBoundEventAssignmentOperatorOperation(B
// 2. the constant value of BoundEventAccess is always null.
// 3. the syntax of the boundEventAssignmentOperator is always AssignmentExpressionSyntax, so the syntax for the event reference would be the LHS of the assignment.
IEventSymbol
@event
=
boundEventAssignmentOperator
.
Event
;
Lazy
<
IOperation
>
instance
=
new
Lazy
<
IOperation
>(()
=>
Create
(
boundEventAssignmentOperator
.
Event
.
IsStatic
?
null
:
boundEventAssignmentOperator
.
ReceiverOpt
));
Lazy
<
IOperation
>
instance
=
new
Lazy
<
IOperation
>(()
=>
Create
(
boundEventAssignmentOperator
.
ReceiverOpt
));
SyntaxNode
eventAccessSyntax
=
((
AssignmentExpressionSyntax
)
syntax
).
Left
;
return
new
LazyEventReferenceExpression
(
@event
,
instance
,
@event
,
eventAccessSyntax
,
@event
.
Type
,
ConvertToOptional
(
null
));
...
...
src/Compilers/CSharp/Test/Semantic/IOperation/IOperationTests_IEventAssignmentExpression.cs
浏览文件 @
d500d521
...
...
@@ -203,5 +203,48 @@ void M()
VerifyOperationTreeAndDiagnosticsForTest
<
AssignmentExpressionSyntax
>(
source
,
expectedOperationTree
,
expectedDiagnostics
);
}
[
Fact
]
public
void
AddEventHandler_AssignToStaticEventOnInstance
()
{
string
source
=
@"
using System;
class Test
{
public static event EventHandler MyEvent;
}
class C
{
void Handler(object sender, EventArgs e)
{
}
void M()
{
var t = new Test();
/*<bind>*/t.MyEvent += Handler/*<bind>*/;
}
}
"
;
string
expectedOperationTree
=
@"
IEventAssignmentExpression (EventAdd)) (OperationKind.EventAssignmentExpression, Type: System.Void, IsInvalid) (Syntax: 't.MyEvent += Handler')
Event Reference: IEventReferenceExpression: event System.EventHandler Test.MyEvent (OperationKind.EventReferenceExpression, Type: System.EventHandler, IsInvalid) (Syntax: 't.MyEvent')
Instance Receiver: ILocalReferenceExpression: t (OperationKind.LocalReferenceExpression, Type: Test, IsInvalid) (Syntax: 't')
Handler: IMethodBindingExpression: void C.Handler(System.Object sender, System.EventArgs e) (OperationKind.MethodBindingExpression, Type: System.EventHandler) (Syntax: 'Handler')
Instance Receiver: IInstanceReferenceExpression (InstanceReferenceKind.Implicit) (OperationKind.InstanceReferenceExpression, Type: C) (Syntax: 'Handler')
"
;
var
expectedDiagnostics
=
new
[]
{
// file.cs(18,19): error CS0176: Member 'Test.MyEvent' cannot be accessed with an instance reference; qualify it with a type name instead
// /*<bind>*/t.MyEvent += Handler/*<bind>*/;
Diagnostic
(
ErrorCode
.
ERR_ObjectProhibited
,
"t.MyEvent"
).
WithArguments
(
"Test.MyEvent"
).
WithLocation
(
18
,
19
),
// file.cs(6,38): warning CS0067: The event 'Test.MyEvent' is never used
// public static event EventHandler MyEvent;
Diagnostic
(
ErrorCode
.
WRN_UnreferencedEvent
,
"MyEvent"
).
WithArguments
(
"Test.MyEvent"
).
WithLocation
(
6
,
38
)
};
VerifyOperationTreeAndDiagnosticsForTest
<
AssignmentExpressionSyntax
>(
source
,
expectedOperationTree
,
expectedDiagnostics
);
}
}
}
src/Compilers/VisualBasic/Portable/Operations/VisualBasicOperationFactory.vb
浏览文件 @
d500d521
...
...
@@ -574,11 +574,7 @@ Namespace Microsoft.CodeAnalysis.Semantics
Private
Function
CreateBoundEventAccessOperation
(
boundEventAccess
As
BoundEventAccess
)
As
IEventReferenceExpression
Dim
instance
As
Lazy
(
Of
IOperation
)
=
New
Lazy
(
Of
IOperation
)(
Function
()
If
boundEventAccess
.
EventSymbol
.
IsShared
Then
Return
Nothing
Else
Return
Create
(
boundEventAccess
.
ReceiverOpt
)
End
If
End
Function
)
Dim
[
event
]
As
IEventSymbol
=
boundEventAccess
.
EventSymbol
...
...
src/Compilers/VisualBasic/Test/Semantic/IOperation/IOperationTests_IEventAssignmentExpression.vb
浏览文件 @
d500d521
...
...
@@ -169,5 +169,39 @@ BC31143: Method 'Public Sub M(x As Integer)' does not have a signature compatibl
VerifyOperationTreeAndDiagnosticsForTest
(
Of
AddRemoveHandlerStatementSyntax
)(
source
,
expectedOperationTree
,
expectedDiagnostics
)
End
Sub
<
Fact
>
Public
Sub
AddEventHandler_AssignToSharedEventOnInstance
()
Dim
source
=
<
!
[
CDATA
[
Imports
System
Class
TestClass
Shared
Event
TestEvent
As
Action
Sub
Remove
()
AddHandler
Me
.
TestEvent
,
AddressOf
M
'BIND:"AddHandler Me.TestEvent, AddressOf M"
End
Sub
Sub
M
()
End
Sub
End
Class
]]
>
.
Value
Dim
expectedOperationTree
=
<
!
[
CDATA
[
IExpressionStatement
(
OperationKind
.
ExpressionStatement
)
(
Syntax
:
'AddHandler ... AddressOf M')
Expression
:
IEventAssignmentExpression
(
EventAdd
))
(
OperationKind
.
EventAssignmentExpression
,
Type
:
null
)
(
Syntax
:
'AddHandler ... AddressOf M')
Event
Reference
:
IEventReferenceExpression
:
Event
TestClass
.
TestEvent
As
System
.
Action
(
OperationKind
.
EventReferenceExpression
,
Type
:
System
.
Action
)
(
Syntax
:
'Me.TestEvent')
Instance
Receiver
:
IInstanceReferenceExpression
(
InstanceReferenceKind
.
Explicit
)
(
OperationKind
.
InstanceReferenceExpression
,
Type
:
TestClass
)
(
Syntax
:
'Me')
Handler
:
IOperation
:
(
OperationKind
.
None
)
(
Syntax
:
'AddressOf M')
Children
(
1
):
IInstanceReferenceExpression
(
InstanceReferenceKind
.
Implicit
)
(
OperationKind
.
InstanceReferenceExpression
,
Type
:
TestClass
)
(
Syntax
:
'M')
]]
>
.
Value
Dim
expectedDiagnostics
=
<
!
[
CDATA
[
BC42025
:
Access
of
shared
member
,
constant
member
,
enum
member
or
nested
type
through
an
instance
;
qualifying
expression
will
not
be
evaluated
.
AddHandler
Me
.
TestEvent
,
AddressOf
M
'BIND:"AddHandler Me.TestEvent, AddressOf M"
~~~~~~~~~~~~
]]
>
.
Value
VerifyOperationTreeAndDiagnosticsForTest
(
Of
AddRemoveHandlerStatementSyntax
)(
source
,
expectedOperationTree
,
expectedDiagnostics
)
End
Sub
End
Class
End
Namespace
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录