Do not wait for all members to be completed to emit an event for a type.

Fixes dotnet#7446
gafter · Dec 15, 2015 · 836e78e · 836e78e
1 parent cbe906c
commit 836e78e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 29 deletions.
diff --git a/src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberContainerSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberContainerSymbol.cs
@@ -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;
                         }
 

diff --git a/src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberMethodSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberMethodSymbol.cs
@@ -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
             {

diff --git a/src/Compilers/CSharp/Portable/Symbols/Source/SourceNamespaceSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Source/SourceNamespaceSymbol.cs
@@ -228,8 +228,8 @@ private Dictionary<string, ImmutableArray<NamespaceOrTypeSymbol>> GetNameToMembe
                     // 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);
                 }
 

diff --git a/src/Compilers/CSharp/Portable/Symbols/Source/SourceNamespaceSymbol_Completion.cs b/src/Compilers/CSharp/Portable/Symbols/Source/SourceNamespaceSymbol_Completion.cs
@@ -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

diff --git a/src/Compilers/CSharp/Test/Semantic/Diagnostics/GetDiagnosticsTests.cs b/src/Compilers/CSharp/Test/Semantic/Diagnostics/GetDiagnosticsTests.cs
@@ -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 @@ private void NonPartialMethod2() { }
             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 @@ private void NonPartialMethod2() { }
             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(tree1.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 void PartialMethod() { }
             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 void PartialMethod() { }
             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(tree1.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
                     {