Merge pull request #2971 from MDoerner/QMNOnRubberduckParserState

retailcoder · web-flow · commit 9dd6be33a346 · 2017-04-15T10:05:20.000-04:00
QMNs on RubberduckParserState
diff --git a/Rubberduck.Inspections/Abstract/InspectionBase.cs b/Rubberduck.Inspections/Abstract/InspectionBase.cs
@@ -9,7 +9,6 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.VBEditor;
-using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Inspections.Abstract
 {
@@ -107,11 +106,11 @@ protected virtual IEnumerable<Declaration> BuiltInDeclarations
             return members.SingleOrDefault(m => m.Selection.Contains(reference.Selection))?.QualifiedName;
         }
 
-        protected bool IsIgnoringInspectionResultFor(IVBComponent component, int line)
+        protected bool IsIgnoringInspectionResultFor(QualifiedModuleName module, int line)
         {
-            var annotations = State.GetModuleAnnotations(component).ToList();
+            var annotations = State.GetModuleAnnotations(module).ToList();
 
-            if (State.GetModuleAnnotations(component) == null)
+            if (State.GetModuleAnnotations(module) == null)
             {
                 return false;
             }
diff --git a/Rubberduck.Inspections/Concrete/EmptyStringLiteralInspection.cs b/Rubberduck.Inspections/Concrete/EmptyStringLiteralInspection.cs
@@ -25,7 +25,7 @@ public EmptyStringLiteralInspection(RubberduckParserState state)
         public override IEnumerable<IInspectionResult> GetInspectionResults()
         {
             return Listener.Contexts
-                .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName.Component, result.Context.Start.Line))
+                .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line))
                 .Select(result => new EmptyStringLiteralInspectionResult(this, result, GetQualifiedMemberName(result)));
         }
 
diff --git a/Rubberduck.Inspections/Concrete/ModuleScopeDimKeywordInspection.cs b/Rubberduck.Inspections/Concrete/ModuleScopeDimKeywordInspection.cs
@@ -26,7 +26,7 @@ public ModuleScopeDimKeywordInspection(RubberduckParserState state)
         public override IEnumerable<IInspectionResult> GetInspectionResults()
         {
             return Listener.Contexts
-                .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName.Component, result.Context.Start.Line))
+                .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line))
                 .SelectMany(result => result.Context.FindChildren<VBAParser.VariableSubStmtContext>()
                         .Select(r => new QualifiedContext<ParserRuleContext>(result.ModuleName, r)))
                 .Select(result => new ModuleScopeDimKeywordInspectionResult(this, result, GetQualifiedMemberName(result)));
diff --git a/Rubberduck.Inspections/Concrete/MultilineParameterInspection.cs b/Rubberduck.Inspections/Concrete/MultilineParameterInspection.cs
@@ -26,7 +26,7 @@ public MultilineParameterInspection(RubberduckParserState state)
         public override IEnumerable<IInspectionResult> GetInspectionResults()
         {
             return Listener.Contexts
-                .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName.Component, result.Context.Start.Line))
+                .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line))
                 .Select(p => new MultilineParameterInspectionResult(this, p, GetQualifiedMemberName(p)));
         }
 
diff --git a/Rubberduck.Inspections/Concrete/MultipleDeclarationsInspection.cs b/Rubberduck.Inspections/Concrete/MultipleDeclarationsInspection.cs
@@ -23,7 +23,7 @@ public MultipleDeclarationsInspection(RubberduckParserState state)
         public override IEnumerable<IInspectionResult> GetInspectionResults()
         {
             return Listener.Contexts
-                .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName.Component, result.Context.Start.Line))
+                .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line))
                 .Select(p => new MultipleDeclarationsInspectionResult(this, p, GetQualifiedMemberName(p)));
         }
 
diff --git a/Rubberduck.Inspections/Concrete/ObsoleteCallStatementInspection.cs b/Rubberduck.Inspections/Concrete/ObsoleteCallStatementInspection.cs
@@ -26,7 +26,7 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
         {
             var results = new List<ObsoleteCallStatementUsageInspectionResult>();
 
-            foreach (var context in Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName.Component, context.Context.Start.Line)))
+            foreach (var context in Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line)))
             {
                 var module = context.ModuleName.Component.CodeModule;
                 var lines = module.GetLines(context.Context.Start.Line,
diff --git a/Rubberduck.Inspections/Concrete/ObsoleteCommentSyntaxInspection.cs b/Rubberduck.Inspections/Concrete/ObsoleteCommentSyntaxInspection.cs
@@ -23,7 +23,7 @@ public ObsoleteCommentSyntaxInspection(RubberduckParserState state) : base(state
 
         public override IEnumerable<IInspectionResult> GetInspectionResults()
         {
-            return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName.Component, context.Context.Start.Line))
+            return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line))
                 .Select(context => new ObsoleteCommentSyntaxInspectionResult(this, context, GetQualifiedMemberName(context)));
         }
 
diff --git a/Rubberduck.Inspections/Concrete/ObsoleteLetStatementInspection.cs b/Rubberduck.Inspections/Concrete/ObsoleteLetStatementInspection.cs
@@ -24,7 +24,7 @@ public ObsoleteLetStatementInspection(RubberduckParserState state)
 
         public override IEnumerable<IInspectionResult> GetInspectionResults()
         {
-            return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName.Component, context.Context.Start.Line))
+            return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line))
                 .Select(context => new ObsoleteLetStatementUsageInspectionResult(this, context, GetQualifiedMemberName(context)));
         }
 
diff --git a/Rubberduck.Inspections/Concrete/OptionBaseInspection.cs b/Rubberduck.Inspections/Concrete/OptionBaseInspection.cs
@@ -24,7 +24,7 @@ public OptionBaseInspection(RubberduckParserState state)
 
         public override IEnumerable<IInspectionResult> GetInspectionResults()
         {
-            return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName.Component, context.Context.Start.Line))
+            return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line))
                 .Select(context => new OptionBaseInspectionResult(this, context, GetQualifiedMemberName(context)));
         }
 
diff --git a/Rubberduck.Inspections/Concrete/OptionBaseZeroInspection.cs b/Rubberduck.Inspections/Concrete/OptionBaseZeroInspection.cs
@@ -26,7 +26,7 @@ public OptionBaseZeroInspection(RubberduckParserState state)
 
         public override IEnumerable<IInspectionResult> GetInspectionResults()
         {
-            return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName.Component, context.Context.Start.Line))
+            return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line))
                                    .Select(context => new OptionBaseZeroInspectionResult(this, context, GetQualifiedMemberName(context)));
         }
 
diff --git a/Rubberduck.Parsing/VBA/IParseTreeProvider.cs b/Rubberduck.Parsing/VBA/IParseTreeProvider.cs
@@ -7,5 +7,7 @@ namespace Rubberduck.Parsing.VBA
     public interface IParseTreeProvider
     {
         List<KeyValuePair<QualifiedModuleName, IParseTree>> ParseTrees { get; }
+
+        IParseTree GetParseTree(QualifiedModuleName module);
     }
 }
diff --git a/Rubberduck.Parsing/VBA/ParseRunnerBase.cs b/Rubberduck.Parsing/VBA/ParseRunnerBase.cs
@@ -91,7 +91,7 @@ private void ProcessComponentParseResults(QualifiedModuleName module, Task<Compo
             {
                 //In contrast to the situation in the success scenario, the overall parser state is reevaluated immediately.
                 //This sets the state directly on the state because it is the sole instance where we have to pass the potential SyntaxErorException.
-                _state.SetModuleState(module.Component, ParserState.Error, token, finishedParseTask.Exception.InnerException as SyntaxErrorException);
+                _state.SetModuleState(module, ParserState.Error, token, finishedParseTask.Exception.InnerException as SyntaxErrorException);
             }
             else
             {
diff --git a/Rubberduck.Parsing/VBA/ParserStateManagerBase.cs b/Rubberduck.Parsing/VBA/ParserStateManagerBase.cs
@@ -43,7 +43,7 @@ public void EvaluateOverallParserState(CancellationToken token)
 
         public void SetModuleState(QualifiedModuleName module, ParserState parserState, CancellationToken token, bool evaluateOverallParserState = true)
         {
-            _state.SetModuleState(module.Component, parserState, token, null, evaluateOverallParserState);
+            _state.SetModuleState(module, parserState, token, null, evaluateOverallParserState);
         }
 
         public void SetStatusAndFireStateChanged(object requestor, ParserState status, CancellationToken token)
diff --git a/Rubberduck.Parsing/VBA/ReferenceResolveRunnerBase.cs b/Rubberduck.Parsing/VBA/ReferenceResolveRunnerBase.cs
@@ -89,7 +89,7 @@ private void ExecuteCompilationPasses()
 
         protected void ResolveReferences(DeclarationFinder finder, QualifiedModuleName module, IParseTree tree, CancellationToken token)
         {
-            Debug.Assert(_state.GetModuleState(module.Component) == ParserState.ResolvingReferences || token.IsCancellationRequested);
+            Debug.Assert(_state.GetModuleState(module) == ParserState.ResolvingReferences || token.IsCancellationRequested);
 
             token.ThrowIfCancellationRequested();
 
diff --git a/Rubberduck.Parsing/VBA/RubberduckParserState.cs b/Rubberduck.Parsing/VBA/RubberduckParserState.cs
diff --git a/RubberduckTests/Grammar/VBAParserValidityTests.cs b/RubberduckTests/Grammar/VBAParserValidityTests.cs
diff --git a/RubberduckTests/Inspections/ObjectVariableNotSetInspectionTests.cs b/RubberduckTests/Inspections/ObjectVariableNotSetInspectionTests.cs
diff --git a/RubberduckTests/Mocks/MockParser.cs b/RubberduckTests/Mocks/MockParser.cs
diff --git a/RubberduckTests/Preprocessing/VBAPreprocessorTests.cs b/RubberduckTests/Preprocessing/VBAPreprocessorTests.cs

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`using Rubberduck.Parsing.Symbols;`
`10`	`10`	`using Rubberduck.Parsing.VBA;`
`11`	`11`	`using Rubberduck.VBEditor;`
`12`		`-using Rubberduck.VBEditor.SafeComWrappers.Abstract;`
`13`	`12`
`14`	`13`	`namespace Rubberduck.Inspections.Abstract`
`15`	`14`	`{`
`@@ -107,11 +106,11 @@ protected virtual IEnumerable<Declaration> BuiltInDeclarations`
`107`	`106`	`return members.SingleOrDefault(m => m.Selection.Contains(reference.Selection))?.QualifiedName;`
`108`	`107`	`}`
`109`	`108`
`110`		`- protected bool IsIgnoringInspectionResultFor(IVBComponent component, int line)`
	`109`	`+ protected bool IsIgnoringInspectionResultFor(QualifiedModuleName module, int line)`
`111`	`110`	`{`
`112`		`- var annotations = State.GetModuleAnnotations(component).ToList();`
	`111`	`+ var annotations = State.GetModuleAnnotations(module).ToList();`
`113`	`112`
`114`		`- if (State.GetModuleAnnotations(component) == null)`
	`113`	`+ if (State.GetModuleAnnotations(module) == null)`
`115`	`114`	`{`
`116`	`115`	`return false;`
`117`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public EmptyStringLiteralInspection(RubberduckParserState state)`
`25`	`25`	`public override IEnumerable<IInspectionResult> GetInspectionResults()`
`26`	`26`	`{`
`27`	`27`	`return Listener.Contexts`
`28`		`- .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName.Component, result.Context.Start.Line))`
	`28`	`+ .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line))`
`29`	`29`	`.Select(result => new EmptyStringLiteralInspectionResult(this, result, GetQualifiedMemberName(result)));`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public ModuleScopeDimKeywordInspection(RubberduckParserState state)`
`26`	`26`	`public override IEnumerable<IInspectionResult> GetInspectionResults()`
`27`	`27`	`{`
`28`	`28`	`return Listener.Contexts`
`29`		`- .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName.Component, result.Context.Start.Line))`
	`29`	`+ .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line))`
`30`	`30`	`.SelectMany(result => result.Context.FindChildren<VBAParser.VariableSubStmtContext>()`
`31`	`31`	`.Select(r => new QualifiedContext<ParserRuleContext>(result.ModuleName, r)))`
`32`	`32`	`.Select(result => new ModuleScopeDimKeywordInspectionResult(this, result, GetQualifiedMemberName(result)));`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public MultilineParameterInspection(RubberduckParserState state)`
`26`	`26`	`public override IEnumerable<IInspectionResult> GetInspectionResults()`
`27`	`27`	`{`
`28`	`28`	`return Listener.Contexts`
`29`		`- .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName.Component, result.Context.Start.Line))`
	`29`	`+ .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line))`
`30`	`30`	`.Select(p => new MultilineParameterInspectionResult(this, p, GetQualifiedMemberName(p)));`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public MultipleDeclarationsInspection(RubberduckParserState state)`
`23`	`23`	`public override IEnumerable<IInspectionResult> GetInspectionResults()`
`24`	`24`	`{`
`25`	`25`	`return Listener.Contexts`
`26`		`- .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName.Component, result.Context.Start.Line))`
	`26`	`+ .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line))`
`27`	`27`	`.Select(p => new MultipleDeclarationsInspectionResult(this, p, GetQualifiedMemberName(p)));`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()`
`26`	`26`	`{`
`27`	`27`	`var results = new List<ObsoleteCallStatementUsageInspectionResult>();`
`28`	`28`
`29`		`- foreach (var context in Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName.Component, context.Context.Start.Line)))`
	`29`	`+ foreach (var context in Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line)))`
`30`	`30`	`{`
`31`	`31`	`var module = context.ModuleName.Component.CodeModule;`
`32`	`32`	`var lines = module.GetLines(context.Context.Start.Line,`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public ObsoleteCommentSyntaxInspection(RubberduckParserState state) : base(state`
`23`	`23`
`24`	`24`	`public override IEnumerable<IInspectionResult> GetInspectionResults()`
`25`	`25`	`{`
`26`		`- return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName.Component, context.Context.Start.Line))`
	`26`	`+ return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line))`
`27`	`27`	`.Select(context => new ObsoleteCommentSyntaxInspectionResult(this, context, GetQualifiedMemberName(context)));`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public ObsoleteLetStatementInspection(RubberduckParserState state)`
`24`	`24`
`25`	`25`	`public override IEnumerable<IInspectionResult> GetInspectionResults()`
`26`	`26`	`{`
`27`		`- return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName.Component, context.Context.Start.Line))`
	`27`	`+ return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line))`
`28`	`28`	`.Select(context => new ObsoleteLetStatementUsageInspectionResult(this, context, GetQualifiedMemberName(context)));`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public OptionBaseInspection(RubberduckParserState state)`
`24`	`24`
`25`	`25`	`public override IEnumerable<IInspectionResult> GetInspectionResults()`
`26`	`26`	`{`
`27`		`- return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName.Component, context.Context.Start.Line))`
	`27`	`+ return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line))`
`28`	`28`	`.Select(context => new OptionBaseInspectionResult(this, context, GetQualifiedMemberName(context)));`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public OptionBaseZeroInspection(RubberduckParserState state)`
`26`	`26`
`27`	`27`	`public override IEnumerable<IInspectionResult> GetInspectionResults()`
`28`	`28`	`{`
`29`		`- return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName.Component, context.Context.Start.Line))`
	`29`	`+ return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line))`
`30`	`30`	`.Select(context => new OptionBaseZeroInspectionResult(this, context, GetQualifiedMemberName(context)));`
`31`	`31`	`}`
`32`	`32`