Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
836e78e5
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,发现更多精彩内容 >>
提交
836e78e5
编写于
12月 14, 2015
作者:
N
Neal Gafter
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Do not wait for all members to be completed to emit an event for a type.
Fixes #7446
上级
cbe906ce
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
23 addition
and
29 deletion
+23
-29
src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberContainerSymbol.cs
...rp/Portable/Symbols/Source/SourceMemberContainerSymbol.cs
+2
-4
src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberMethodSymbol.cs
...Sharp/Portable/Symbols/Source/SourceMemberMethodSymbol.cs
+9
-7
src/Compilers/CSharp/Portable/Symbols/Source/SourceNamespaceSymbol.cs
...s/CSharp/Portable/Symbols/Source/SourceNamespaceSymbol.cs
+1
-1
src/Compilers/CSharp/Portable/Symbols/Source/SourceNamespaceSymbol_Completion.cs
...rtable/Symbols/Source/SourceNamespaceSymbol_Completion.cs
+1
-4
src/Compilers/CSharp/Test/Semantic/Diagnostics/GetDiagnosticsTests.cs
...s/CSharp/Test/Semantic/Diagnostics/GetDiagnosticsTests.cs
+10
-13
未找到文件。
src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberContainerSymbol.cs
浏览文件 @
836e78e5
...
...
@@ -468,6 +468,7 @@ internal override void ForceComplete(SourceLocation locationOpt, CancellationTok
var
diagnostics
=
DiagnosticBag
.
GetInstance
();
AfterMembersChecks
(
diagnostics
);
AddDeclarationDiagnostics
(
diagnostics
);
DeclaringCompilation
.
SymbolDeclaredEvent
(
this
);
var
thisThreadCompleted
=
state
.
NotePartComplete
(
CompletionPart
.
FinishMemberChecks
);
Debug
.
Assert
(
thisThreadCompleted
);
diagnostics
.
Free
();
...
...
@@ -510,10 +511,7 @@ internal override void ForceComplete(SourceLocation locationOpt, CancellationTok
// We've completed all members, so we're ready for the PointedAtManagedTypeChecks;
// proceed to the next iteration.
if
(
state
.
NotePartComplete
(
CompletionPart
.
MembersCompleted
))
{
DeclaringCompilation
.
SymbolDeclaredEvent
(
this
);
}
state
.
NotePartComplete
(
CompletionPart
.
MembersCompleted
);
break
;
}
...
...
src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberMethodSymbol.cs
浏览文件 @
836e78e5
...
...
@@ -390,10 +390,14 @@ protected sealed override void LazyAsyncMethodChecks(CancellationToken cancellat
if
(!
this
.
IsAsync
)
{
state
.
NotePartComplete
(
CompletionPart
.
StartAsyncMethodChecks
);
if
(
state
.
NotePartComplete
(
CompletionPart
.
FinishAsyncMethodChecks
)
&&
IsPartialDefinition
)
if
(
state
.
NotePartComplete
(
CompletionPart
.
StartAsyncMethodChecks
))
{
DeclaringCompilation
.
SymbolDeclaredEvent
(
this
);
if
(
IsPartialDefinition
)
DeclaringCompilation
.
SymbolDeclaredEvent
(
this
);
state
.
NotePartComplete
(
CompletionPart
.
FinishAsyncMethodChecks
);
}
else
{
state
.
SpinWaitComplete
(
CompletionPart
.
FinishAsyncMethodChecks
,
cancellationToken
);
}
return
;
...
...
@@ -431,10 +435,8 @@ protected sealed override void LazyAsyncMethodChecks(CancellationToken cancellat
if
(
state
.
NotePartComplete
(
CompletionPart
.
StartAsyncMethodChecks
))
{
AddDeclarationDiagnostics
(
diagnostics
);
if
(
state
.
NotePartComplete
(
CompletionPart
.
FinishAsyncMethodChecks
)
&&
IsPartialDefinition
)
{
DeclaringCompilation
.
SymbolDeclaredEvent
(
this
);
}
if
(
IsPartialDefinition
)
DeclaringCompilation
.
SymbolDeclaredEvent
(
this
);
state
.
NotePartComplete
(
CompletionPart
.
FinishAsyncMethodChecks
);
}
else
{
...
...
src/Compilers/CSharp/Portable/Symbols/Source/SourceNamespaceSymbol.cs
浏览文件 @
836e78e5
...
...
@@ -228,8 +228,8 @@ internal override NamespaceExtent Extent
// NOTE: the following is not cancellable. Once we've set the
// members, we *must* do the following to make sure we're in a consistent state.
this
.
DeclaringCompilation
.
DeclarationDiagnostics
.
AddRange
(
diagnostics
);
RegisterDeclaredCorTypes
();
DeclaringCompilation
.
SymbolDeclaredEvent
(
this
);
_state
.
NotePartComplete
(
CompletionPart
.
NameToMembersMap
);
}
...
...
src/Compilers/CSharp/Portable/Symbols/Source/SourceNamespaceSymbol_Completion.cs
浏览文件 @
836e78e5
...
...
@@ -76,10 +76,7 @@ internal override void ForceComplete(SourceLocation locationOpt, CancellationTok
if
(
allCompleted
)
{
if
(
_state
.
NotePartComplete
(
CompletionPart
.
MembersCompleted
))
{
DeclaringCompilation
.
SymbolDeclaredEvent
(
this
);
}
_state
.
NotePartComplete
(
CompletionPart
.
MembersCompleted
);
break
;
}
else
...
...
src/Compilers/CSharp/Test/Semantic/Diagnostics/GetDiagnosticsTests.cs
浏览文件 @
836e78e5
...
...
@@ -127,7 +127,7 @@ public void Foo()
Assert
.
Equal
(
4
,
info
.
WarningLevel
);
}
[
Fact
(
Skip
=
"7446"
)
,
WorkItem
(
7446
,
"https://github.com/dotnet/roslyn/issues/7446"
)]
[
Fact
,
WorkItem
(
7446
,
"https://github.com/dotnet/roslyn/issues/7446"
)]
public
void
TestCompilationEventQueueWithSemanticModelGetDiagnostics
()
{
var
source1
=
@"
...
...
@@ -155,10 +155,8 @@ partial class Class
var
compilation
=
CreateCompilationWithMscorlib45
(
new
[]
{
tree1
,
tree2
}).
WithEventQueue
(
eventQueue
);
// Invoke SemanticModel.GetDiagnostics to force populate the event queue for symbols in the first source file.
var
tree
=
compilation
.
SyntaxTrees
.
Single
(
t
=>
t
==
tree1
);
var
root
=
tree
.
GetRoot
();
var
model
=
compilation
.
GetSemanticModel
(
tree
);
model
.
GetDiagnostics
(
root
.
FullSpan
);
var
model
=
compilation
.
GetSemanticModel
(
tree1
);
model
.
GetDiagnostics
(
tree1
.
GetRoot
().
FullSpan
);
Assert
.
True
(
eventQueue
.
Count
>
0
);
bool
compilationStartedFired
;
...
...
@@ -171,10 +169,10 @@ partial class Class
Assert
.
True
(
declaredSymbolNames
.
Contains
(
"N1"
));
Assert
.
True
(
declaredSymbolNames
.
Contains
(
"Class"
));
Assert
.
True
(
declaredSymbolNames
.
Contains
(
"NonPartialMethod1"
));
Assert
.
True
(
completedCompilationUnits
.
Contains
(
tree
.
FilePath
));
Assert
.
True
(
completedCompilationUnits
.
Contains
(
tree
1
.
FilePath
));
}
[
Fact
(
Skip
=
"
7446"
),
WorkItem
(
7446
,
"https://github.com/dotnet/roslyn/issues/7446
"
)]
[
Fact
(
Skip
=
"
https://github.com/dotnet/roslyn/issues/7477"
),
WorkItem
(
7477
,
"https://github.com/dotnet/roslyn/issues/7477
"
)]
public
void
TestCompilationEventsForPartialMethod
()
{
var
source1
=
@"
...
...
@@ -204,10 +202,8 @@ partial class Class
var
compilation
=
CreateCompilationWithMscorlib45
(
new
[]
{
tree1
,
tree2
}).
WithEventQueue
(
eventQueue
);
// Invoke SemanticModel.GetDiagnostics to force populate the event queue for symbols in the first source file.
var
tree
=
compilation
.
SyntaxTrees
.
Single
(
t
=>
t
==
tree1
);
var
root
=
tree
.
GetRoot
();
var
model
=
compilation
.
GetSemanticModel
(
tree
);
model
.
GetDiagnostics
(
root
.
FullSpan
);
var
model
=
compilation
.
GetSemanticModel
(
tree1
);
model
.
GetDiagnostics
(
tree1
.
GetRoot
().
FullSpan
);
Assert
.
True
(
eventQueue
.
Count
>
0
);
bool
compilationStartedFired
;
...
...
@@ -221,7 +217,7 @@ partial class Class
Assert
.
True
(
declaredSymbolNames
.
Contains
(
"Class"
));
Assert
.
True
(
declaredSymbolNames
.
Contains
(
"NonPartialMethod1"
));
Assert
.
True
(
declaredSymbolNames
.
Contains
(
"PartialMethod"
));
Assert
.
True
(
completedCompilationUnits
.
Contains
(
tree
.
FilePath
));
Assert
.
True
(
completedCompilationUnits
.
Contains
(
tree
1
.
FilePath
));
}
private
static
bool
DequeueCompilationEvents
(
AsyncQueue
<
CompilationEvent
>
eventQueue
,
out
bool
compilationStartedFired
,
out
HashSet
<
string
>
declaredSymbolNames
,
out
HashSet
<
string
>
completedCompilationUnits
)
...
...
@@ -247,7 +243,8 @@ private static bool DequeueCompilationEvents(AsyncQueue<CompilationEvent> eventQ
var
symbolDeclaredEvent
=
compEvent
as
SymbolDeclaredCompilationEvent
;
if
(
symbolDeclaredEvent
!=
null
)
{
Assert
.
True
(
declaredSymbolNames
.
Add
(
symbolDeclaredEvent
.
Symbol
.
Name
),
"Unexpected multiple symbol declared events for same symbol"
);
var
added
=
declaredSymbolNames
.
Add
(
symbolDeclaredEvent
.
Symbol
.
Name
);
Assert
.
True
(
added
,
"Unexpected multiple symbol declared events for symbol "
+
symbolDeclaredEvent
.
Symbol
);
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录