Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
2a0ac086
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,发现更多精彩内容 >>
提交
2a0ac086
编写于
6月 19, 2017
作者:
K
Karlo
提交者:
AlekseyTs
6月 19, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #19002 Error CS0503 shows the correct modifier target (#19025)
* Error CS0503 shows the correct modifier target
上级
217f6506
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
23 addition
and
13 deletion
+23
-13
src/Compilers/CSharp/Portable/CSharpResources.Designer.cs
src/Compilers/CSharp/Portable/CSharpResources.Designer.cs
+1
-1
src/Compilers/CSharp/Portable/CSharpResources.resx
src/Compilers/CSharp/Portable/CSharpResources.resx
+1
-1
src/Compilers/CSharp/Portable/Symbols/Source/SourceEventSymbol.cs
...ilers/CSharp/Portable/Symbols/Source/SourceEventSymbol.cs
+1
-1
src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberMethodSymbol.cs
...Sharp/Portable/Symbols/Source/SourceMemberMethodSymbol.cs
+1
-1
src/Compilers/CSharp/Portable/Symbols/Source/SourcePropertySymbol.cs
...rs/CSharp/Portable/Symbols/Source/SourcePropertySymbol.cs
+1
-1
src/Compilers/CSharp/Test/Symbol/Symbols/SymbolErrorTests.cs
src/Compilers/CSharp/Test/Symbol/Symbols/SymbolErrorTests.cs
+18
-8
未找到文件。
src/Compilers/CSharp/Portable/CSharpResources.Designer.cs
浏览文件 @
2a0ac086
...
...
@@ -179,7 +179,7 @@ internal class CSharpResources {
}
/// <summary>
/// Looks up a localized string similar to The abstract
method '{0
}' cannot be marked virtual.
/// Looks up a localized string similar to The abstract
{0} '{1
}' cannot be marked virtual.
/// </summary>
internal static string ERR_AbstractNotVirtual {
get {
...
...
src/Compilers/CSharp/Portable/CSharpResources.resx
浏览文件 @
2a0ac086
...
...
@@ -1422,7 +1422,7 @@ If such a class is used as a base class and if the deriving class defines a dest
<value>
'{0}' cannot be both abstract and sealed
</value>
</data>
<data
name=
"ERR_AbstractNotVirtual"
xml:space=
"preserve"
>
<value>
The abstract
method '{0
}' cannot be marked virtual
</value>
<value>
The abstract
{0} '{1
}' cannot be marked virtual
</value>
</data>
<data
name=
"ERR_StaticConstant"
xml:space=
"preserve"
>
<value>
The constant '{0}' cannot be marked static
</value>
...
...
src/Compilers/CSharp/Portable/Symbols/Source/SourceEventSymbol.cs
浏览文件 @
2a0ac086
...
...
@@ -485,7 +485,7 @@ protected void CheckModifiersAndType(DiagnosticBag diagnostics)
}
else
if
(
IsAbstract
&&
IsVirtual
)
{
diagnostics
.
Add
(
ErrorCode
.
ERR_AbstractNotVirtual
,
location
,
this
);
diagnostics
.
Add
(
ErrorCode
.
ERR_AbstractNotVirtual
,
location
,
this
.
Kind
.
Localize
(),
this
);
}
else
if
(
ContainingType
.
IsSealed
&&
this
.
DeclaredAccessibility
.
HasProtected
()
&&
!
this
.
IsOverride
)
{
...
...
src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberMethodSymbol.cs
浏览文件 @
2a0ac086
...
...
@@ -940,7 +940,7 @@ private void CheckModifiers(Location location, DiagnosticBag diagnostics)
}
else
if
(
IsAbstract
&&
IsVirtual
)
{
diagnostics
.
Add
(
ErrorCode
.
ERR_AbstractNotVirtual
,
location
,
this
);
diagnostics
.
Add
(
ErrorCode
.
ERR_AbstractNotVirtual
,
location
,
this
.
Kind
.
Localize
(),
this
);
}
else
if
(
IsAbstract
&&
ContainingType
.
TypeKind
==
TypeKind
.
Struct
)
{
...
...
src/Compilers/CSharp/Portable/Symbols/Source/SourcePropertySymbol.cs
浏览文件 @
2a0ac086
...
...
@@ -848,7 +848,7 @@ private void CheckModifiers(Location location, bool isIndexer, DiagnosticBag dia
}
else
if
(
IsAbstract
&&
IsVirtual
)
{
diagnostics
.
Add
(
ErrorCode
.
ERR_AbstractNotVirtual
,
location
,
this
);
diagnostics
.
Add
(
ErrorCode
.
ERR_AbstractNotVirtual
,
location
,
this
.
Kind
.
Localize
(),
this
);
}
else
if
(
ContainingType
.
IsSealed
&&
this
.
DeclaredAccessibility
.
HasProtected
()
&&
!
this
.
IsOverride
)
{
...
...
src/Compilers/CSharp/Test/Symbol/Symbols/SymbolErrorTests.cs
浏览文件 @
2a0ac086
...
...
@@ -7746,7 +7746,7 @@ abstract public class cly : clx
[Fact]
public void CS0503ERR_AbstractNotVirtual01()
{
var
text
= @"namespace NS
var
source
= @"namespace NS
{
abstract public class clx
{
...
...
@@ -7757,14 +7757,24 @@ abstract public class clx
} // class clx
}
";
var comp = DiagnosticsUtils.VerifyErrorsAndGetCompilationWithMscorlib(text,
new ErrorDescription { Code = (int)ErrorCode.ERR_AbstractNotVirtual, Line = 5, Column = 40 },
new ErrorDescription { Code = (int)ErrorCode.ERR_AbstractNotVirtual, Line = 6, Column = 41 },
new ErrorDescription { Code = (int)ErrorCode.ERR_AbstractNotVirtual, Line = 7, Column = 40 },
new ErrorDescription { Code = (int)ErrorCode.ERR_AbstractNotVirtual, Line = 8, Column = 53 });
var ns = comp.SourceModule.GlobalNamespace.GetMembers("NS").Single() as NamespaceSymbol;
// TODO...
var comp = CreateStandardCompilation(source).VerifyDiagnostics(
// (7,40): error CS0503: The abstract property 'clx.P' cannot be marked virtual
// virtual abstract public object P { get; set; }
Diagnostic(ErrorCode.ERR_AbstractNotVirtual, "P").WithArguments("property", "NS.clx.P").WithLocation(7, 40),
// (6,41): error CS0503: The abstract method 'clx.M2<T>(T)' cannot be marked virtual
// abstract virtual protected void M2<T>(T t);
Diagnostic(ErrorCode.ERR_AbstractNotVirtual, "M2").WithArguments("method", "NS.clx.M2<T>(T)").WithLocation(6, 41),
// (5,40): error CS0503: The abstract method 'clx.M1()' cannot be marked virtual
// abstract virtual internal void M1();
Diagnostic(ErrorCode.ERR_AbstractNotVirtual, "M1").WithArguments("method", "NS.clx.M1()").WithLocation(5, 40),
// (8,53): error CS0503: The abstract event 'clx.E' cannot be marked virtual
// virtual abstract public event System.Action E;
Diagnostic(ErrorCode.ERR_AbstractNotVirtual, "E").WithArguments("event", "NS.clx.E").WithLocation(8, 53));
var nsNamespace = comp.SourceModule.GlobalNamespace.GetMembers("NS").Single() as NamespaceSymbol;
var clxClass = nsNamespace.GetMembers("clx").Single() as NamedTypeSymbol;
Assert.Equal(9, clxClass.GetMembers().Length);
}
[Fact]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录