Guarantee a reparse after an AttributeRewriteSession gets applied

Previously, this would not happen if no rewriter is dirty. This can leave us in a bad state because other functionality might expect it to happen. The exception is when no rewriter has been checked out at all.

Author: MDoerner

Rubberduck.Parsing/Rewriter/AttributesRewriteSession.cs

@@ -24,8 +24,9 @@ protected override IExecutableModuleRewriter ModuleRewriter(QualifiedModuleName
         }
 
         protected override bool TryRewriteInternal()
-        {          
+        {
             //The suspension ensures that only one parse gets executed instead of two for each rewritten module.
+            GuaranteeReparseAfterRewrite();
             var result = _parseManager.OnSuspendParser(this, new[] {ParserState.Ready, ParserState.ResolvedDeclarations}, ExecuteAllRewriters);
             if(result != SuspensionResult.Completed)
             {
@@ -36,6 +37,22 @@ protected override bool TryRewriteInternal()
             return true;
         }
 
+        private void GuaranteeReparseAfterRewrite()
+        {
+            _parseManager.StateChanged += ReparseOnSuspension;
+        }
+
+        private void ReparseOnSuspension(object requestor, ParserStateEventArgs e)
+        {
+            if (e.State != ParserState.Busy)
+            {
+                return;
+            }
+
+            _parseManager.StateChanged -= ReparseOnSuspension;
+            _parseManager.OnParseRequested(this);
+        }
+
         private void ExecuteAllRewriters()
         {
             foreach (var module in CheckedOutModuleRewriters.Keys)

RubberduckTests/Rewriter/MemberAttributeRecovererTests.cs

@@ -144,9 +144,7 @@ Public Function Bar() As Variant
                 var declarationsForWhichToRemoveAttributes = state.DeclarationFinder.UserDeclarations(DeclarationType.Function);
                 RemoveAttributes(declarationsForWhichToRemoveAttributes, rewriteSession);
 
-                //We need the extra parse request because in the mocked setup attribute rewrites do not cause a reparse due to the lack of invoked component added handlers.
-                ExecuteAndWaitForParserState(state, () => rewriteSession.TryRewrite(), ParserState.Busy);
-                ExecuteAndWaitForParserState(state, () => state.OnParseRequested(this), ParserState.Ready);
+                ExecuteAndWaitForParserState(state, () => rewriteSession.TryRewrite(), ParserState.Ready);
             }
             var actualCode = component.CodeModule.Content();
             Assert.AreEqual(expectedCode, actualCode);
@@ -250,9 +248,7 @@ Public Function Bar() As Variant
                 var declarationsForWhichToRemoveAttributes = state.DeclarationFinder.UserDeclarations(DeclarationType.Function);
                 RemoveAttributes(declarationsForWhichToRemoveAttributes, rewriteSession);
 
-                //We need the extra parse request because in the mocked setup attribute rewrites do not cause a reparse due to the lack of invoked component added handlers.
-                ExecuteAndWaitForParserState(state, () => rewriteSession.TryRewrite(), ParserState.Busy);
-                ExecuteAndWaitForParserState(state, () => state.OnParseRequested(this), ParserState.Ready);
+                ExecuteAndWaitForParserState(state, () => rewriteSession.TryRewrite(), ParserState.Ready);
 
                 var actualCodeWithRecovery = state.ProjectsProvider.Component(recoveryModule).CodeModule.Content();
                 var actualCodeWithoutRecovery = state.ProjectsProvider.Component(noRecoveryModule).CodeModule.Content();