Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
2ed7ecef
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,发现更多精彩内容 >>
提交
2ed7ecef
编写于
9月 21, 2015
作者:
A
AlekseyTs
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5345 from AlekseyTs/Issue4696
Add C# language version check for read-only auto-properties.
上级
fe6b7766
09398766
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
56 addition
and
2 deletion
+56
-2
src/Compilers/CSharp/Portable/CSharpResources.Designer.cs
src/Compilers/CSharp/Portable/CSharpResources.Designer.cs
+9
-0
src/Compilers/CSharp/Portable/CSharpResources.resx
src/Compilers/CSharp/Portable/CSharpResources.resx
+3
-0
src/Compilers/CSharp/Portable/Errors/MessageID.cs
src/Compilers/CSharp/Portable/Errors/MessageID.cs
+2
-0
src/Compilers/CSharp/Portable/Symbols/Source/SourcePropertySymbol.cs
...rs/CSharp/Portable/Symbols/Source/SourcePropertySymbol.cs
+5
-2
src/Compilers/CSharp/Test/Symbol/Symbols/Source/PropertyTests.cs
...pilers/CSharp/Test/Symbol/Symbols/Source/PropertyTests.cs
+34
-0
src/Compilers/CSharp/Test/Symbol/Symbols/SymbolErrorTests.cs
src/Compilers/CSharp/Test/Symbol/Symbols/SymbolErrorTests.cs
+3
-0
未找到文件。
src/Compilers/CSharp/Portable/CSharpResources.Designer.cs
浏览文件 @
2ed7ecef
...
...
@@ -9161,6 +9161,15 @@ internal class CSharpResources {
}
}
/// <summary>
/// Looks up a localized string similar to readonly automatically implemented properties.
/// </summary>
internal static string IDS_FeatureReadonlyAutoImplementedProperties {
get {
return ResourceManager.GetString("IDS_FeatureReadonlyAutoImplementedProperties", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to static classes.
/// </summary>
...
...
src/Compilers/CSharp/Portable/CSharpResources.resx
浏览文件 @
2ed7ecef
...
...
@@ -219,6 +219,9 @@
<data
name=
"IDS_FeatureAutoImplementedProperties"
xml:space=
"preserve"
>
<value>
automatically implemented properties
</value>
</data>
<data
name=
"IDS_FeatureReadonlyAutoImplementedProperties"
xml:space=
"preserve"
>
<value>
readonly automatically implemented properties
</value>
</data>
<data
name=
"IDS_FeatureObjectInitializer"
xml:space=
"preserve"
>
<value>
object initializer
</value>
</data>
...
...
src/Compilers/CSharp/Portable/Errors/MessageID.cs
浏览文件 @
2ed7ecef
...
...
@@ -111,6 +111,7 @@ internal enum MessageID
IDS_FeatureInterpolatedStrings
=
MessageBase
+
12702
,
IDS_OperationCausedStackOverflow
=
MessageBase
+
12703
,
IDS_AwaitInCatchAndFinally
=
MessageBase
+
12704
,
IDS_FeatureReadonlyAutoImplementedProperties
=
MessageBase
+
12705
,
}
// Message IDs may refer to strings that need to be localized.
...
...
@@ -171,6 +172,7 @@ internal static LanguageVersion RequiredVersion(this MessageID feature)
case
MessageID
.
IDS_FeatureUsingStatic
:
case
MessageID
.
IDS_FeatureInterpolatedStrings
:
case
MessageID
.
IDS_AwaitInCatchAndFinally
:
case
MessageID
.
IDS_FeatureReadonlyAutoImplementedProperties
:
return
LanguageVersion
.
CSharp6
;
// C# 5 features.
...
...
src/Compilers/CSharp/Portable/Symbols/Source/SourcePropertySymbol.cs
浏览文件 @
2ed7ecef
...
...
@@ -154,6 +154,7 @@ internal sealed class SourcePropertySymbol : PropertySymbol, IAttributeTargetSym
{
var
hasGetSyntax
=
getSyntax
!=
null
;
_isAutoProperty
=
notRegularProperty
&&
hasGetSyntax
;
bool
isReadOnly
=
hasGetSyntax
&&
setSyntax
==
null
;
if
(
_isAutoProperty
||
hasInitializer
)
{
...
...
@@ -165,7 +166,6 @@ internal sealed class SourcePropertySymbol : PropertySymbol, IAttributeTargetSym
}
string
fieldName
=
GeneratedNames
.
MakeBackingFieldName
(
_sourceName
);
bool
isReadOnly
=
hasGetSyntax
&&
setSyntax
==
null
;
_backingField
=
new
SynthesizedBackingFieldSymbol
(
this
,
fieldName
,
isReadOnly
,
...
...
@@ -175,7 +175,10 @@ internal sealed class SourcePropertySymbol : PropertySymbol, IAttributeTargetSym
if
(
notRegularProperty
)
{
Binder
.
CheckFeatureAvailability
(
location
,
MessageID
.
IDS_FeatureAutoImplementedProperties
,
diagnostics
);
Binder
.
CheckFeatureAvailability
(
location
,
isReadOnly
?
MessageID
.
IDS_FeatureReadonlyAutoImplementedProperties
:
MessageID
.
IDS_FeatureAutoImplementedProperties
,
diagnostics
);
}
}
...
...
src/Compilers/CSharp/Test/Symbol/Symbols/Source/PropertyTests.cs
浏览文件 @
2ed7ecef
...
...
@@ -2784,5 +2784,39 @@ static void Main(string[] args)
Diagnostic
(
ErrorCode
.
ERR_IllegalUnsafe
,
"Test"
).
WithLocation
(
2
,
14
)
);
}
[
Fact
,
WorkItem
(
4696
,
"https://github.com/dotnet/roslyn/issues/4696"
)]
public
void
LangVersioAndReadonlyAutoProperty
()
{
var
source
=
@"
public class Class1
{
public Class1()
{
Prop1 = ""Test"";
}
public string Prop1 { get; }
}
abstract class Class2
{
public abstract string Prop2 { get; }
}
interface I1
{
string Prop3 { get; }
}
"
;
var
comp
=
CreateCompilationWithMscorlib
(
source
,
parseOptions
:
CSharpParseOptions
.
Default
.
WithLanguageVersion
(
LanguageVersion
.
CSharp5
));
comp
.
GetDeclarationDiagnostics
().
Verify
(
// (9,19): error CS8026: Feature 'readonly automatically implemented properties' is not available in C# 5. Please use language version 6 or greater.
// public string Prop1 { get; }
Diagnostic
(
ErrorCode
.
ERR_FeatureNotAvailableInVersion5
,
"Prop1"
).
WithArguments
(
"readonly automatically implemented properties"
,
"6"
).
WithLocation
(
9
,
19
)
);
}
}
}
src/Compilers/CSharp/Test/Symbol/Symbols/SymbolErrorTests.cs
浏览文件 @
2ed7ecef
...
...
@@ -1838,6 +1838,9 @@ class B : A
// (8,34): error CS0112: A static member 'B.Q' cannot be marked as override, virtual, or abstract
// public static virtual object Q { get; }
Diagnostic(ErrorCode.ERR_StaticNotVirtual, "Q").WithArguments("B.Q").WithLocation(8, 34),
// (8,34): error CS8026: Feature 'readonly automatically implemented properties' is not available in C# 5. Please use language version 6 or greater.
// public static virtual object Q { get; }
Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion5, "Q").WithArguments("readonly automatically implemented properties", "6").WithLocation(8, 34),
// (9,37): error CS0112: A static member 'B.R' cannot be marked as override, virtual, or abstract
// internal static abstract object R { get; set; }
Diagnostic(ErrorCode.ERR_StaticNotVirtual, "R").WithArguments("B.R").WithLocation(9, 37),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录