Skip to content

Commit 9a00e68

Browse files
authored
Merge pull request #1812 from rubberduck-vba/revert-1810-parserIssues
Revert "Make parser/resolver run more asynchronously."
2 parents 2c54a19 + 4d7a2c0 commit 9a00e68

File tree

3 files changed

+206
-693
lines changed

3 files changed

+206
-693
lines changed

Rubberduck.Parsing/VBA/ComponentParseTask.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,26 +75,23 @@ public void Start(CancellationToken token)
7575
Tokens = stream,
7676
Attributes = attributes,
7777
Comments = comments,
78-
Annotations = annotationListener.Annotations,
79-
Component = _component
78+
Annotations = annotationListener.Annotations
8079
});
8180
}
8281
catch (COMException exception)
8382
{
8483
_logger.Error(exception, "Exception thrown in thread {0}.", Thread.CurrentThread.ManagedThreadId);
8584
ParseFailure.Invoke(this, new ParseFailureArgs
8685
{
87-
Cause = exception,
88-
Component = _component
86+
Cause = exception
8987
});
9088
}
9189
catch (SyntaxErrorException exception)
9290
{
9391
_logger.Error(exception, "Exception thrown in thread {0}.", Thread.CurrentThread.ManagedThreadId);
9492
ParseFailure.Invoke(this, new ParseFailureArgs
9593
{
96-
Cause = exception,
97-
Component = _component
94+
Cause = exception
9895
});
9996
}
10097
catch (OperationCanceledException)
@@ -127,7 +124,6 @@ private IEnumerable<CommentNode> QualifyAndUnionComments(QualifiedModuleName qua
127124

128125
public class ParseCompletionArgs
129126
{
130-
public VBComponent Component { get; internal set; }
131127
public ITokenStream Tokens { get; internal set; }
132128
public IParseTree ParseTree { get; internal set; }
133129
public IDictionary<Tuple<string, DeclarationType>, Attributes> Attributes { get; internal set; }
@@ -137,7 +133,6 @@ public class ParseCompletionArgs
137133

138134
public class ParseFailureArgs
139135
{
140-
public VBComponent Component { get; internal set; }
141136
public Exception Cause { get; internal set; }
142137
}
143138

0 commit comments

Comments
 (0)