Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
dc923ba4
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,发现更多精彩内容 >>
提交
dc923ba4
编写于
2月 06, 2017
作者:
C
CyrusNajmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix generation of events in interfaces.
上级
8ccaa4e1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
16 deletion
+12
-16
src/Compilers/CSharp/Portable/Parser/LanguageParser.cs
src/Compilers/CSharp/Portable/Parser/LanguageParser.cs
+2
-2
src/Workspaces/CSharp/Portable/CodeGeneration/CSharpSyntaxGenerator.cs
...s/CSharp/Portable/CodeGeneration/CSharpSyntaxGenerator.cs
+7
-7
src/Workspaces/CSharpTest/CodeGeneration/SyntaxGeneratorTests.cs
...kspaces/CSharpTest/CodeGeneration/SyntaxGeneratorTests.cs
+3
-7
未找到文件。
src/Compilers/CSharp/Portable/Parser/LanguageParser.cs
浏览文件 @
dc923ba4
...
...
@@ -4083,7 +4083,7 @@ private void ParseParameterModifiers(SyntaxListBuilder modifiers)
}
}
private
Member
DeclarationSyntax
ParseEventDeclarationWithAccessors
(
private
Event
DeclarationSyntax
ParseEventDeclarationWithAccessors
(
SyntaxListBuilder
<
AttributeListSyntax
>
attributes
,
SyntaxListBuilder
modifiers
,
SyntaxToken
eventToken
,
...
...
@@ -4206,7 +4206,7 @@ private void ParseParameterModifiers(SyntaxListBuilder modifiers)
}
}
private
Member
DeclarationSyntax
ParseEventFieldDeclaration
(
private
EventField
DeclarationSyntax
ParseEventFieldDeclaration
(
SyntaxListBuilder
<
AttributeListSyntax
>
attributes
,
SyntaxListBuilder
modifiers
,
SyntaxToken
eventToken
,
...
...
src/Workspaces/CSharp/Portable/CodeGeneration/CSharpSyntaxGenerator.cs
浏览文件 @
dc923ba4
...
...
@@ -733,18 +733,18 @@ internal override SyntaxNode AsInterfaceMember(SyntaxNode m)
.
WithModifiers
(
default
(
SyntaxTokenList
))
.
WithAccessorList
(
WithoutBodies
(
indexer
.
AccessorList
));
// convert event into field event
case
SyntaxKind
.
EventDeclaration
:
var
ev
=
(
EventDeclarationSyntax
)
member
;
return
ev
.
WithModifiers
(
default
(
SyntaxTokenList
))
.
WithAccessorList
(
WithoutBodies
(
ev
.
AccessorList
));
return
this
.
EventDeclaration
(
ev
.
Identifier
.
ValueText
,
ev
.
Type
,
Accessibility
.
NotApplicable
,
DeclarationModifiers
.
None
);
// convert event field into event
case
SyntaxKind
.
EventFieldDeclaration
:
var
ef
=
(
EventFieldDeclarationSyntax
)
member
;
this
.
GetAccessibilityAndModifiers
(
ef
.
Modifiers
,
out
acc
,
out
modifiers
);
var
ep
=
this
.
CustomEventDeclaration
(
this
.
GetName
(
ef
),
this
.
ClearTrivia
(
this
.
GetType
(
ef
)),
acc
,
modifiers
,
parameters
:
null
,
addAccessorStatements
:
null
,
removeAccessorStatements
:
null
);
return
this
.
AsInterfaceMember
(
ep
);
return
ef
.
WithModifiers
(
default
(
SyntaxTokenList
));
// convert field into property
case
SyntaxKind
.
FieldDeclaration
:
...
...
src/Workspaces/CSharpTest/CodeGeneration/SyntaxGeneratorTests.cs
浏览文件 @
dc923ba4
...
...
@@ -1212,11 +1212,11 @@ public void TestInterfaceDeclarations()
VerifySyntax
<
InterfaceDeclarationSyntax
>(
_g
.
InterfaceDeclaration
(
"i"
,
members
:
new
[]
{
_g
.
CustomEventDeclaration
(
"ep"
,
_g
.
IdentifierName
(
"t"
),
accessibility
:
Accessibility
.
Public
,
modifiers
:
DeclarationModifiers
.
Static
)
}),
"interface i\r\n{\r\n event t ep
\r\n {\r\n add;\r\n remove;\r\n }
\r\n}"
);
"interface i\r\n{\r\n event t ep
;
\r\n}"
);
VerifySyntax
<
InterfaceDeclarationSyntax
>(
_g
.
InterfaceDeclaration
(
"i"
,
members
:
new
[]
{
_g
.
EventDeclaration
(
"ef"
,
_g
.
IdentifierName
(
"t"
),
accessibility
:
Accessibility
.
Public
,
modifiers
:
DeclarationModifiers
.
Static
)
}),
"interface i\r\n{\r\n event t ef
\r\n {\r\n add;\r\n remove;\r\n }
\r\n}"
);
"interface i\r\n{\r\n event t ef
;
\r\n}"
);
VerifySyntax
<
InterfaceDeclarationSyntax
>(
_g
.
InterfaceDeclaration
(
"i"
,
members
:
new
[]
{
_g
.
FieldDeclaration
(
"f"
,
_g
.
IdentifierName
(
"t"
),
accessibility
:
Accessibility
.
Public
,
modifiers
:
DeclarationModifiers
.
Sealed
)
}),
...
...
@@ -1677,11 +1677,7 @@ public void TestInterfaceDeclarationWithEventFromSymbol()
_g
.
Declaration
(
_emptyCompilation
.
GetTypeByMetadataName
(
"System.ComponentModel.INotifyPropertyChanged"
)),
@"public interface INotifyPropertyChanged
{
event global::System.ComponentModel.PropertyChangedEventHandler PropertyChanged
{
add;
remove;
}
event global::System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
}"
);
}
#
endregion
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录