Merge pull request #2490 from retailcoder/next

retailcoder · web-flow · commit 89dc500f9080 · 2017-01-06T01:33:00.000-05:00
2.0.11
diff --git a/RetailCoder.VBE/API/ParserState.cs b/RetailCoder.VBE/API/ParserState.cs
@@ -49,7 +49,7 @@ public sealed class ParserState : IParserState, IDisposable
 
         private RubberduckParserState _state;
         private AttributeParser _attributeParser;
-        private RubberduckParser _parser;
+        private ParseCoordinator _parser;
         private VBE _vbe;
 
         public ParserState()
@@ -70,7 +70,7 @@ public void Initialize(VBE vbe)
 
             Func<IVBAPreprocessor> preprocessorFactory = () => new VBAPreprocessor(double.Parse(vbe.Version, CultureInfo.InvariantCulture));
             _attributeParser = new AttributeParser(new ModuleExporter(), preprocessorFactory);
-            _parser = new RubberduckParser(vbe, _state, _attributeParser, preprocessorFactory,
+            _parser = new ParseCoordinator(vbe, _state, _attributeParser, preprocessorFactory,
                 new List<ICustomDeclarationLoader> { new DebugDeclarations(_state), new SpecialFormDeclarations(_state), new FormEventDeclarations(_state), new AliasDeclarations(_state) });
         }
 
diff --git a/RetailCoder.VBE/App.cs b/RetailCoder.VBE/App.cs
@@ -23,7 +23,7 @@ public sealed class App : IDisposable
     {
         private readonly IVBE _vbe;
         private readonly IMessageBox _messageBox;
-        private readonly IRubberduckParser _parser;
+        private readonly IParseCoordinator _parser;
         private readonly AutoSave.AutoSave _autoSave;
         private readonly IGeneralConfigService _configService;
         private readonly IAppMenu _appMenus;
@@ -36,7 +36,7 @@ public sealed class App : IDisposable
 
         public App(IVBE vbe, 
             IMessageBox messageBox,
-            IRubberduckParser parser,
+            IParseCoordinator parser,
             IGeneralConfigService configService,
             IAppMenu appMenus,
             RubberduckCommandBar stateBar,
diff --git a/RetailCoder.VBE/Inspections/ImplicitActiveSheetReferenceInspection.cs b/RetailCoder.VBE/Inspections/ImplicitActiveSheetReferenceInspection.cs
@@ -4,20 +4,14 @@
 using Rubberduck.Inspections.Resources;
 using Rubberduck.Inspections.Results;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.VBEditor.Application;
-using Rubberduck.VBEditor.Extensions;
-using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Inspections
 {
     public sealed class ImplicitActiveSheetReferenceInspection : InspectionBase
     {
-        private readonly IHostApplication _hostApp;
-
-        public ImplicitActiveSheetReferenceInspection(IVBE vbe, RubberduckParserState state)
+        public ImplicitActiveSheetReferenceInspection(RubberduckParserState state)
             : base(state)
         {
-            _hostApp = vbe.HostApplication();
         }
 
         public override string Meta { get { return InspectionsUI.ImplicitActiveSheetReferenceInspectionMeta; } }
@@ -31,22 +25,18 @@ public ImplicitActiveSheetReferenceInspection(IVBE vbe, RubberduckParserState st
 
         public override IEnumerable<InspectionResultBase> GetInspectionResults()
         {
-            if (_hostApp == null || _hostApp.ApplicationName != "Excel")
-            {
-                return Enumerable.Empty<InspectionResultBase>();
-                // if host isn't Excel, the ExcelObjectModel declarations shouldn't be loaded anyway.
-            }
-
             var matches = BuiltInDeclarations.Where(item =>
+                        item.ProjectName == "Excel" &&
                         Targets.Contains(item.IdentifierName) &&
-                        item.ParentScope == "EXCEL.EXE;Excel._Global" &&
+                        item.ParentDeclaration.ComponentName == "_Global" &&
                         item.AsTypeName == "Range").ToList();
 
             var issues = matches.Where(item => item.References.Any())
                 .SelectMany(declaration => declaration.References.Distinct());
 
-            return issues.Select(issue => 
-                new ImplicitActiveSheetReferenceInspectionResult(this, issue));
+            return issues
+                .Where(issue => !issue.IsInspectionDisabled(AnnotationName))
+                .Select(issue => new ImplicitActiveSheetReferenceInspectionResult(this, issue));
         }
     }
 }
diff --git a/RetailCoder.VBE/Inspections/ImplicitActiveWorkbookReferenceInspection.cs b/RetailCoder.VBE/Inspections/ImplicitActiveWorkbookReferenceInspection.cs
@@ -4,20 +4,14 @@
 using Rubberduck.Inspections.Resources;
 using Rubberduck.Inspections.Results;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.VBEditor.Application;
-using Rubberduck.VBEditor.Extensions;
-using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Inspections
 {
     public sealed class ImplicitActiveWorkbookReferenceInspection : InspectionBase
     {
-        private readonly IHostApplication _hostApp;
-
-        public ImplicitActiveWorkbookReferenceInspection(IVBE vbe, RubberduckParserState state)
+        public ImplicitActiveWorkbookReferenceInspection(RubberduckParserState state)
             : base(state)
         {
-            _hostApp = vbe.HostApplication();
         }
 
         public override string Meta { get { return InspectionsUI.ImplicitActiveWorkbookReferenceInspectionMeta; } }
@@ -31,22 +25,16 @@ public ImplicitActiveWorkbookReferenceInspection(IVBE vbe, RubberduckParserState
 
         private static readonly string[] ParentScopes =
         {
-            "EXCEL.EXE;Excel._Global",
-            "EXCEL.EXE;Excel._Application",
-            "EXCEL.EXE;Excel.Sheets",
-            //"EXCEL.EXE;Excel.Worksheets",
+            "_Global",
+            "_Application",
+            "Sheets",
+            //"Worksheets",
         };
 
         public override IEnumerable<InspectionResultBase> GetInspectionResults()
         {
-            if (_hostApp == null || _hostApp.ApplicationName != "Excel")
-            {
-                return Enumerable.Empty<InspectionResultBase>();
-                // if host isn't Excel, the ExcelObjectModel declarations shouldn't be loaded anyway.
-            }
-
             var issues = BuiltInDeclarations
-                .Where(item => ParentScopes.Contains(item.ParentScope) 
+                .Where(item => item.ProjectName == "Excel" && ParentScopes.Contains(item.ComponentName) 
                     && item.References.Any(r => Targets.Contains(r.IdentifierName)))
                 .SelectMany(declaration => declaration.References.Distinct())
                 .Where(item => Targets.Contains(item.IdentifierName))
diff --git a/RetailCoder.VBE/Navigation/RegexSearchReplace/RegexSearchReplace.cs b/RetailCoder.VBE/Navigation/RegexSearchReplace/RegexSearchReplace.cs
@@ -14,9 +14,9 @@ namespace Rubberduck.Navigation.RegexSearchReplace
     public class RegexSearchReplace : IRegexSearchReplace
     {
         private readonly IVBE _vbe;
-        private readonly IRubberduckParser _parser;
+        private readonly IParseCoordinator _parser;
 
-        public RegexSearchReplace(IVBE vbe, IRubberduckParser parser)
+        public RegexSearchReplace(IVBE vbe, IParseCoordinator parser)
         {
             _vbe = vbe;
             _parser = parser;
diff --git a/RetailCoder.VBE/Properties/AssemblyInfo.cs b/RetailCoder.VBE/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.10.*")]
-[assembly: AssemblyFileVersion("2.0.10.0")]
+[assembly: AssemblyVersion("2.0.11.*")]
+[assembly: AssemblyFileVersion("2.0.11.0")]
diff --git a/RetailCoder.VBE/Root/RubberduckModule.cs b/RetailCoder.VBE/Root/RubberduckModule.cs
@@ -75,7 +75,7 @@ public override void Load()
             {
                 Assembly.GetExecutingAssembly(),
                 Assembly.GetAssembly(typeof(IHostApplication)),
-                Assembly.GetAssembly(typeof(IRubberduckParser)),
+                Assembly.GetAssembly(typeof(IParseCoordinator)),
                 Assembly.GetAssembly(typeof(IIndenter))
             };
 
@@ -91,7 +91,7 @@ public override void Load()
             Bind<Func<IIndenterSettings>>().ToMethod(t => () => KernelInstance.Get<IGeneralConfigService>().LoadConfiguration().UserSettings.IndenterSettings);
 
             BindCustomDeclarationLoadersToParser();
-            Rebind<IRubberduckParser>().To<RubberduckParser>().InSingletonScope();
+            Rebind<IParseCoordinator>().To<ParseCoordinator>().InSingletonScope();
             Bind<Func<IVBAPreprocessor>>().ToMethod(p => () => new VBAPreprocessor(double.Parse(_vbe.Version, CultureInfo.InvariantCulture)));
             
             Rebind<ISearchResultsWindowViewModel>().To<SearchResultsWindowViewModel>().InSingletonScope();
diff --git a/Rubberduck.Parsing/IParseCoordinator.cs b/Rubberduck.Parsing/IParseCoordinator.cs
@@ -3,7 +3,7 @@
 
 namespace Rubberduck.Parsing
 {
-    public interface IRubberduckParser : IDisposable
+    public interface IParseCoordinator : IDisposable
     {
         RubberduckParserState State { get; }
     }
diff --git a/Rubberduck.Parsing/Rubberduck.Parsing.csproj b/Rubberduck.Parsing/Rubberduck.Parsing.csproj
@@ -158,7 +158,7 @@
     <Compile Include="Binding\SimpleNameTypeBinding.cs" />
     <Compile Include="ComHelper.cs" />
     <Compile Include="IParseResultProvider.cs" />
-    <Compile Include="IRubberduckParser.cs" />
+    <Compile Include="IParseCoordinator.cs" />
     <Compile Include="ParsingText.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -296,7 +296,7 @@
     <Compile Include="VBA\ParseErrorEventArgs.cs" />
     <Compile Include="VBA\ParserState.cs" />
     <Compile Include="VBA\ReferencePriorityMap.cs" />
-    <Compile Include="VBA\RubberduckParser.cs" />
+    <Compile Include="VBA\ParseCoordinator.cs" />
     <Compile Include="VBA\RubberduckParserState.cs" />
     <Compile Include="VBA\StringExtensions.cs" />
     <Compile Include="VBA\VBALikePatternParser.cs" />
diff --git a/Rubberduck.Parsing/VBA/ParseCoordinator.cs b/Rubberduck.Parsing/VBA/ParseCoordinator.cs
@@ -18,7 +18,7 @@
 
 namespace Rubberduck.Parsing.VBA
 {
-    public class RubberduckParser : IRubberduckParser
+    public class ParseCoordinator : IParseCoordinator
     {
         public RubberduckParserState State { get { return _state; } }
         
@@ -37,7 +37,7 @@ private readonly IDictionary<IVBComponent, IDictionary<Tuple<string, Declaration
 
         private readonly bool _isTestScope;
 
-        public RubberduckParser(
+        public ParseCoordinator(
             IVBE vbe,
             RubberduckParserState state,
             IAttributeParser attributeParser,
@@ -654,7 +654,7 @@ private void ResolveReferences(DeclarationFinder finder, IVBComponent component,
                     var watch = Stopwatch.StartNew();
                     walker.Walk(listener, tree);
                     watch.Stop();
-                    Logger.Debug("Binding Resolution done for component '{0}' in {1}ms (thread {2})", component.Name,
+                    Logger.Debug("Binding resolution done for component '{0}' in {1}ms (thread {2})", component.Name,
                         watch.ElapsedMilliseconds, Thread.CurrentThread.ManagedThreadId);
 
                     State.SetModuleState(component, ParserState.Ready);
diff --git a/RubberduckTests/Inspections/ImplicitActiveSheetReferenceInspectionTests.cs b/RubberduckTests/Inspections/ImplicitActiveSheetReferenceInspectionTests.cs
@@ -49,7 +49,7 @@ End Sub
             parser.Parse(new CancellationTokenSource());
             if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
 
-            var inspection = new ImplicitActiveSheetReferenceInspection(vbe.Object, parser.State);
+            var inspection = new ImplicitActiveSheetReferenceInspection(parser.State);
             var inspectionResults = inspection.GetInspectionResults();
 
             Assert.AreEqual(1, inspectionResults.Count());
@@ -86,10 +86,10 @@ End Sub
             parser.Parse(new CancellationTokenSource());
             if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
 
-            var inspection = new ImplicitActiveSheetReferenceInspection(vbe.Object, parser.State);
+            var inspection = new ImplicitActiveSheetReferenceInspection(parser.State);
             var inspectionResults = inspection.GetInspectionResults();
 
-            Assert.AreEqual(1, inspectionResults.Count());
+            Assert.AreEqual(0, inspectionResults.Count());
         }
 
         [TestMethod]
@@ -127,7 +127,7 @@ Dim arr1() As Variant
             parser.Parse(new CancellationTokenSource());
             if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
 
-            var inspection = new ImplicitActiveSheetReferenceInspection(vbe.Object, parser.State);
+            var inspection = new ImplicitActiveSheetReferenceInspection(parser.State);
             var inspectionResults = inspection.GetInspectionResults();
 
             inspectionResults.First().QuickFixes.Single(s => s is IgnoreOnceQuickFix).Fix();
@@ -146,7 +146,7 @@ public void InspectionType()
                 .Build();
             var vbe = builder.AddProject(project).Build();
 
-            var inspection = new ImplicitActiveSheetReferenceInspection(vbe.Object, null);
+            var inspection = new ImplicitActiveSheetReferenceInspection(null);
             Assert.AreEqual(CodeInspectionType.MaintainabilityAndReadabilityIssues, inspection.InspectionType);
         }
 
@@ -162,7 +162,7 @@ public void InspectionName()
             var vbe = builder.AddProject(project).Build();
 
             const string inspectionName = "ImplicitActiveSheetReferenceInspection";
-            var inspection = new ImplicitActiveSheetReferenceInspection(vbe.Object, null);
+            var inspection = new ImplicitActiveSheetReferenceInspection(null);
 
             Assert.AreEqual(inspectionName, inspection.Name);
         }
diff --git a/RubberduckTests/Mocks/MockParser.cs b/RubberduckTests/Mocks/MockParser.cs
@@ -31,19 +31,25 @@ public static void ParseString(string inputCode, out QualifiedModuleName qualifi
 
         }
 
-        public static RubberduckParser Create(IVBE vbe, RubberduckParserState state)
+        public static ParseCoordinator Create(IVBE vbe, RubberduckParserState state)
         {
             var attributeParser = new Mock<IAttributeParser>();
             attributeParser.Setup(m => m.Parse(It.IsAny<IVBComponent>()))
                            .Returns(() => new Dictionary<Tuple<string, DeclarationType>, Attributes>());
             return Create(vbe, state, attributeParser.Object);
         }
 
-        public static RubberduckParser Create(IVBE vbe, RubberduckParserState state, IAttributeParser attributeParser)
+        public static ParseCoordinator Create(IVBE vbe, RubberduckParserState state, IAttributeParser attributeParser)
         {
-            return new RubberduckParser(vbe, state, attributeParser,
+            return new ParseCoordinator(vbe, state, attributeParser,
                 () => new VBAPreprocessor(double.Parse(vbe.Version, CultureInfo.InvariantCulture)),
-                new List<ICustomDeclarationLoader> {new DebugDeclarations(state), new SpecialFormDeclarations(state), new FormEventDeclarations(state), new AliasDeclarations(state)}, true);
+                new List<ICustomDeclarationLoader>
+                {
+                    new DebugDeclarations(state), 
+                    new SpecialFormDeclarations(state), 
+                    new FormEventDeclarations(state), 
+                    new AliasDeclarations(state),
+                }, true);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,20 +4,14 @@`
`4`	`4`	`using Rubberduck.Inspections.Resources;`
`5`	`5`	`using Rubberduck.Inspections.Results;`
`6`	`6`	`using Rubberduck.Parsing.VBA;`
`7`		`-using Rubberduck.VBEditor.Application;`
`8`		`-using Rubberduck.VBEditor.Extensions;`
`9`		`-using Rubberduck.VBEditor.SafeComWrappers.Abstract;`
`10`	`7`
`11`	`8`	`namespace Rubberduck.Inspections`
`12`	`9`	`{`
`13`	`10`	`public sealed class ImplicitActiveSheetReferenceInspection : InspectionBase`
`14`	`11`	`{`
`15`		`- private readonly IHostApplication _hostApp;`
`16`		`-`
`17`		`- public ImplicitActiveSheetReferenceInspection(IVBE vbe, RubberduckParserState state)`
	`12`	`+ public ImplicitActiveSheetReferenceInspection(RubberduckParserState state)`
`18`	`13`	`: base(state)`
`19`	`14`	`{`
`20`		`- _hostApp = vbe.HostApplication();`
`21`	`15`	`}`
`22`	`16`
`23`	`17`	`public override string Meta { get { return InspectionsUI.ImplicitActiveSheetReferenceInspectionMeta; } }`
`@@ -31,22 +25,18 @@ public ImplicitActiveSheetReferenceInspection(IVBE vbe, RubberduckParserState st`
`31`	`25`
`32`	`26`	`public override IEnumerable<InspectionResultBase> GetInspectionResults()`
`33`	`27`	`{`
`34`		`- if (_hostApp == null \|\| _hostApp.ApplicationName != "Excel")`
`35`		`- {`
`36`		`- return Enumerable.Empty<InspectionResultBase>();`
`37`		`- // if host isn't Excel, the ExcelObjectModel declarations shouldn't be loaded anyway.`
`38`		`- }`
`39`		`-`
`40`	`28`	`var matches = BuiltInDeclarations.Where(item =>`
	`29`	`+ item.ProjectName == "Excel" &&`
`41`	`30`	`Targets.Contains(item.IdentifierName) &&`
`42`		`- item.ParentScope == "EXCEL.EXE;Excel._Global" &&`
	`31`	`+ item.ParentDeclaration.ComponentName == "_Global" &&`
`43`	`32`	`item.AsTypeName == "Range").ToList();`
`44`	`33`
`45`	`34`	`var issues = matches.Where(item => item.References.Any())`
`46`	`35`	`.SelectMany(declaration => declaration.References.Distinct());`
`47`	`36`
`48`		`- return issues.Select(issue =>`
`49`		`- new ImplicitActiveSheetReferenceInspectionResult(this, issue));`
	`37`	`+ return issues`
	`38`	`+ .Where(issue => !issue.IsInspectionDisabled(AnnotationName))`
	`39`	`+ .Select(issue => new ImplicitActiveSheetReferenceInspectionResult(this, issue));`
`50`	`40`	`}`
`51`	`41`	`}`
`52`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ namespace Rubberduck.Navigation.RegexSearchReplace`
`14`	`14`	`public class RegexSearchReplace : IRegexSearchReplace`
`15`	`15`	`{`
`16`	`16`	`private readonly IVBE _vbe;`
`17`		`- private readonly IRubberduckParser _parser;`
	`17`	`+ private readonly IParseCoordinator _parser;`
`18`	`18`
`19`		`- public RegexSearchReplace(IVBE vbe, IRubberduckParser parser)`
	`19`	`+ public RegexSearchReplace(IVBE vbe, IParseCoordinator parser)`
`20`	`20`	`{`
`21`	`21`	`_vbe = vbe;`
`22`	`22`	`_parser = parser;`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace Rubberduck.Parsing`
`5`	`5`	`{`
`6`		`- public interface IRubberduckParser : IDisposable`
	`6`	`+ public interface IParseCoordinator : IDisposable`
`7`	`7`	`{`
`8`	`8`	`RubberduckParserState State { get; }`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,19 +31,25 @@ public static void ParseString(string inputCode, out QualifiedModuleName qualifi`
`31`	`31`
`32`	`32`	`}`
`33`	`33`
`34`		`- public static RubberduckParser Create(IVBE vbe, RubberduckParserState state)`
	`34`	`+ public static ParseCoordinator Create(IVBE vbe, RubberduckParserState state)`
`35`	`35`	`{`
`36`	`36`	`var attributeParser = new Mock<IAttributeParser>();`
`37`	`37`	`attributeParser.Setup(m => m.Parse(It.IsAny<IVBComponent>()))`
`38`	`38`	`.Returns(() => new Dictionary<Tuple<string, DeclarationType>, Attributes>());`
`39`	`39`	`return Create(vbe, state, attributeParser.Object);`
`40`	`40`	`}`
`41`	`41`
`42`		`- public static RubberduckParser Create(IVBE vbe, RubberduckParserState state, IAttributeParser attributeParser)`
	`42`	`+ public static ParseCoordinator Create(IVBE vbe, RubberduckParserState state, IAttributeParser attributeParser)`
`43`	`43`	`{`
`44`		`- return new RubberduckParser(vbe, state, attributeParser,`
	`44`	`+ return new ParseCoordinator(vbe, state, attributeParser,`
`45`	`45`	`() => new VBAPreprocessor(double.Parse(vbe.Version, CultureInfo.InvariantCulture)),`
`46`		`- new List<ICustomDeclarationLoader> {new DebugDeclarations(state), new SpecialFormDeclarations(state), new FormEventDeclarations(state), new AliasDeclarations(state)}, true);`
	`46`	`+ new List<ICustomDeclarationLoader>`
	`47`	`+ {`
	`48`	`+ new DebugDeclarations(state),`
	`49`	`+ new SpecialFormDeclarations(state),`
	`50`	`+ new FormEventDeclarations(state),`
	`51`	`+ new AliasDeclarations(state),`
	`52`	`+ }, true);`
`47`	`53`	`}`
`48`	`54`	`}`
`49`	`55`	`}`