Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
c9ff8d3e
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,发现更多精彩内容 >>
提交
c9ff8d3e
编写于
10月 08, 2015
作者:
C
Charles Stoner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Report error for await in static script variable initializer
上级
ea420004
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
46 addition
and
8 deletion
+46
-8
src/Compilers/CSharp/Portable/Binder/Binder_Await.cs
src/Compilers/CSharp/Portable/Binder/Binder_Await.cs
+8
-1
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/ErrorCode.cs
src/Compilers/CSharp/Portable/Errors/ErrorCode.cs
+1
-0
src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncTests.cs
src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncTests.cs
+25
-7
未找到文件。
src/Compilers/CSharp/Portable/Binder/Binder_Await.cs
浏览文件 @
c9ff8d3e
...
...
@@ -125,7 +125,14 @@ private bool ReportBadAwaitWithoutAsync(CSharpSyntaxNode node, DiagnosticBag dia
case
SymbolKind
.
Field
:
if
(
containingMemberOrLambda
.
ContainingType
.
IsScriptClass
)
{
return
false
;
if
(((
FieldSymbol
)
containingMemberOrLambda
).
IsStatic
)
{
info
=
new
CSDiagnosticInfo
(
ErrorCode
.
ERR_BadAwaitInStaticVariableInitializer
);
}
else
{
return
false
;
}
}
break
;
case
SymbolKind
.
Method
:
...
...
src/Compilers/CSharp/Portable/CSharpResources.Designer.cs
浏览文件 @
c9ff8d3e
...
...
@@ -1051,6 +1051,15 @@ internal class CSharpResources {
}
}
/// <summary>
/// Looks up a localized string similar to The 'await' operator cannot be used in a static script variable initializer..
/// </summary>
internal static string ERR_BadAwaitInStaticVariableInitializer {
get {
return ResourceManager.GetString("ERR_BadAwaitInStaticVariableInitializer", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The 'await' operator can only be used when contained within a method or lambda expression marked with the 'async' modifier.
/// </summary>
...
...
src/Compilers/CSharp/Portable/CSharpResources.resx
浏览文件 @
c9ff8d3e
...
...
@@ -3530,6 +3530,9 @@ Give the compiler some way to differentiate the methods. For example, you can gi
<data
name=
"ERR_BadAwaitInLock"
xml:space=
"preserve"
>
<value>
Cannot await in the body of a lock statement
</value>
</data>
<data
name=
"ERR_BadAwaitInStaticVariableInitializer"
xml:space=
"preserve"
>
<value>
The 'await' operator cannot be used in a static script variable initializer.
</value>
</data>
<data
name=
"ERR_AwaitInUnsafeContext"
xml:space=
"preserve"
>
<value>
Cannot await in an unsafe context
</value>
</data>
...
...
src/Compilers/CSharp/Portable/Errors/ErrorCode.cs
浏览文件 @
c9ff8d3e
...
...
@@ -1315,5 +1315,6 @@ internal enum ErrorCode
ERR_LoadDirectiveOnlyAllowedInScripts
=
8097
,
ERR_PPLoadFollowsToken
=
8098
,
ERR_SourceFileReferencesNotSupported
=
8099
,
ERR_BadAwaitInStaticVariableInitializer
=
8100
,
}
}
src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncTests.cs
浏览文件 @
c9ff8d3e
...
...
@@ -3672,20 +3672,38 @@ public void AwaitInInteractiveDeclaration()
/// <summary>
/// await should be disallowed in static field initializer
/// since the static initialization of the class
should
///
complete before other members are used
.
/// since the static initialization of the class
must be
///
handled synchronously in the .cctor
.
/// </summary>
[
Fact
(
Skip
=
"Not handled"
)]
public
void
AwaitInStaticInitializer
()
[
WorkItem
(
5787
)]
[
Fact
]
public
void
AwaitInScriptStaticInitializer
()
{
var
source
=
@"static int x = 1 +
await System.Threading.Tasks.Task.FromResult(1);
int y = x +
await System.Threading.Tasks.Task.FromResult(2);"
;
var
compilation
=
CreateCompilationWithMscorlib45
(
source
,
parseOptions
:
TestOptions
.
Script
,
options
:
TestOptions
.
DebugExe
);
compilation
.
VerifyDiagnostics
(
// (2,5): error CS8100: The 'await' operator cannot be used in a static script variable initializer.
// await System.Threading.Tasks.Task.FromResult(1);
Diagnostic
(
ErrorCode
.
ERR_BadAwaitInStaticVariableInitializer
,
"await System.Threading.Tasks.Task.FromResult(1)"
).
WithLocation
(
2
,
5
));
}
[
WorkItem
(
5787
)]
[
Fact
]
public
void
AwaitInInteractiveStaticInitializer
()
{
var
references
=
new
[]
{
MscorlibRef_v4_0_30316_17626
,
SystemCoreRef
};
var
source
=
@"static int x = await System.Threading.Tasks.Task.FromResult(1);"
;
@"static int x = await System.Threading.Tasks.Task.FromResult(1);
int y = await System.Threading.Tasks.Task.FromResult(2);"
;
var
compilation
=
CSharpCompilation
.
CreateSubmission
(
"s0.dll"
,
SyntaxFactory
.
ParseSyntaxTree
(
source
,
options
:
TestOptions
.
Interactive
),
references
);
compilation
.
VerifyDiagnostics
(
// (1,16): error CS
1992: The 'await' operator can only be used when contained within a method or lambda expression marked with the 'async' modifier
// (1,16): error CS
8100: The 'await' operator cannot be used in a static script variable initializer.
// static int x = await System.Threading.Tasks.Task.FromResult(1);
Diagnostic
(
ErrorCode
.
ERR_BadAwait
WithoutAsync
,
"await System.Threading.Tasks.Task.FromResult(1)"
).
WithLocation
(
1
,
16
));
Diagnostic
(
ErrorCode
.
ERR_BadAwait
InStaticVariableInitializer
,
"await System.Threading.Tasks.Task.FromResult(1)"
).
WithLocation
(
1
,
16
));
}
[
Fact
,
WorkItem
(
4839
,
"https://github.com/dotnet/roslyn/issues/4839"
)]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录