Skip to content

Commit be0a04f

Browse files
authored
Merge pull request #1837 from Hosch250/Issue1814
Don't fire ResolvedDeclarations unless the project parsed and resolve…
2 parents c720350 + ef2ff8b commit be0a04f

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

Rubberduck.Parsing/VBA/RubberduckParser.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,10 @@ private void ReparseRequested(object sender, ParseRequestEventArgs e)
8484
_state.SetModuleState(e.Component, ParserState.Resolving);
8585
ResolveDeclarations(qualifiedName.Component,
8686
_state.ParseTrees.Find(s => s.Key == qualifiedName).Value);
87-
88-
_state.SetStatusAndFireStateChanged(ParserState.ResolvedDeclarations);
89-
87+
9088
if (_state.Status < ParserState.Error)
9189
{
90+
_state.SetStatusAndFireStateChanged(ParserState.ResolvedDeclarations);
9291
ResolveReferencesAsync();
9392
}
9493
});
@@ -170,10 +169,10 @@ public void Parse()
170169
}
171170

172171
Task.WaitAll(parseTasks);
173-
_state.SetStatusAndFireStateChanged(ParserState.ResolvedDeclarations);
174172

175173
if (_state.Status < ParserState.Error)
176174
{
175+
_state.SetStatusAndFireStateChanged(ParserState.ResolvedDeclarations);
177176
Task.WaitAll(ResolveReferencesAsync());
178177
}
179178
}
@@ -277,10 +276,10 @@ private void ParseAll()
277276
}
278277

279278
Task.WaitAll(parseTasks);
280-
_state.SetStatusAndFireStateChanged(ParserState.ResolvedDeclarations);
281279

282280
if (_state.Status < ParserState.Error)
283281
{
282+
_state.SetStatusAndFireStateChanged(ParserState.ResolvedDeclarations);
284283
ResolveReferencesAsync();
285284
}
286285
}

0 commit comments

Comments
 (0)