Merge pull request #2594 from comintern/next

retailcoder · web-flow · commit bee0f0829169 · 2017-01-29T23:06:52.000-05:00
Bypass VBA\Interop bug for broken references.  Show Test Explorer if hidden when "Run all tests" selected from menu.
diff --git a/RetailCoder.VBE/Root/RubberduckModule.cs b/RetailCoder.VBE/Root/RubberduckModule.cs
@@ -120,7 +120,9 @@ public override void Load()
                 .InSingletonScope();
 
             Bind<IDockablePresenter>().To<TestExplorerDockablePresenter>()
-                .WhenInjectedInto<TestExplorerCommand>()
+                .WhenInjectedInto(
+                    typeof (RunAllTestsCommand), 
+                    typeof (TestExplorerCommand))
                 .InSingletonScope();
 
             Bind<IDockablePresenter>().To<CodeInspectionsDockablePresenter>()
diff --git a/RetailCoder.VBE/UI/Command/RunAllTestsCommand.cs b/RetailCoder.VBE/UI/Command/RunAllTestsCommand.cs
@@ -17,15 +17,17 @@ public class RunAllTestsCommand : CommandBase
         private readonly IVBE _vbe;
         private readonly ITestEngine _engine;
         private readonly TestExplorerModel _model;
+        private readonly IDockablePresenter _presenter;
         private readonly RubberduckParserState _state;
-        
-        public RunAllTestsCommand(IVBE vbe, RubberduckParserState state, ITestEngine engine, TestExplorerModel model) 
+
+        public RunAllTestsCommand(IVBE vbe, RubberduckParserState state, ITestEngine engine, TestExplorerModel model, IDockablePresenter presenter) 
             : base(LogManager.GetCurrentClassLogger())
         {
             _vbe = vbe;
             _engine = engine;
             _model = model;
             _state = state;
+            _presenter = presenter;
         }
 
         private static readonly ParserState[] AllowedRunStates = { ParserState.ResolvedDeclarations, ParserState.ResolvingReferences, ParserState.Ready };
@@ -76,6 +78,11 @@ private void RunTests()
             _model.ClearLastRun();
             _model.IsBusy = true;
 
+            if (_presenter != null)
+            {
+                _presenter.Show();
+            }
+
             stopwatch.Start();
             _engine.Run(_model.Tests);
             stopwatch.Stop();
diff --git a/RetailCoder.VBE/UI/UnitTesting/TestExplorerViewModel.cs b/RetailCoder.VBE/UI/UnitTesting/TestExplorerViewModel.cs
@@ -45,7 +45,7 @@ public TestExplorerViewModel(IVBE vbe,
 
             _navigateCommand = new NavigateCommand();
 
-            _runAllTestsCommand = new RunAllTestsCommand(vbe, state, testEngine, model);
+            _runAllTestsCommand = new RunAllTestsCommand(vbe, state, testEngine, model, null);
             _runAllTestsCommand.RunCompleted += RunCompleted;
 
             _addTestModuleCommand = new AddTestModuleCommand(vbe, state, configService);
diff --git a/Rubberduck.Parsing/VBA/ParseCoordinator.cs b/Rubberduck.Parsing/VBA/ParseCoordinator.cs
@@ -458,6 +458,10 @@ private void SyncComReferences(IReadOnlyList<IVBProject> projects)
                     for (var priority = 1; priority <= references.Count; priority++)
                     {
                         var reference = references[priority];
+                        if (reference.IsBroken)
+                        {
+                            continue;                           
+                        }
 
                         // skip loading Rubberduck.tlb (GUID is defined in AssemblyInfo.cs)
                         if (reference.Guid == "{E07C841C-14B4-4890-83E9-8C80B06DD59D}")
diff --git a/Rubberduck.VBEEditor/SafeComWrappers/VB6/Reference.cs b/Rubberduck.VBEEditor/SafeComWrappers/VB6/Reference.cs
@@ -12,22 +12,22 @@ public Reference(VB.Reference target)
 
         public string Name
         {
-            get { return IsWrappingNullReference ? string.Empty : Target.Name; }
+            get { return IsBroken ? string.Empty : Target.Name; }
         }
 
         public string Guid
         {
-            get { return IsWrappingNullReference ? string.Empty : Target.Guid; }
+            get { return IsBroken ? string.Empty : Target.Guid; }
         }
 
         public int Major
         {
-            get { return IsWrappingNullReference ? 0 : Target.Major; }
+            get { return IsBroken ? 0 : Target.Major; }
         }
 
         public int Minor
         {
-            get { return IsWrappingNullReference ? 0 : Target.Minor; }
+            get { return IsBroken ? 0 : Target.Minor; }
         }
 
         public string Version
@@ -37,17 +37,17 @@ public string Version
 
         public string Description
         {
-            get { return IsWrappingNullReference ? string.Empty : Target.Description; }
+            get { return IsBroken ? string.Empty : Target.Description; }
         }
 
         public string FullPath
         {
-            get { return IsWrappingNullReference ? string.Empty : Target.FullPath; }
+            get { return IsBroken ? string.Empty : Target.FullPath; }
         }
 
         public bool IsBuiltIn
         {
-            get { return !IsWrappingNullReference && Target.BuiltIn; }
+            get { return !IsBroken && Target.BuiltIn; }
         }
 
         public bool IsBroken
@@ -57,17 +57,17 @@ public bool IsBroken
 
         public ReferenceKind Type
         {
-            get { return IsWrappingNullReference ? 0 : (ReferenceKind)Target.Type; }
+            get { return IsBroken ? 0 : (ReferenceKind)Target.Type; }
         }
 
         public IReferences Collection
         {
-            get { return new References(IsWrappingNullReference ? null : Target.Collection); }
+            get { return new References(IsBroken ? null : Target.Collection); }
         }
 
         public IVBE VBE
         {
-            get { return new VBE(IsWrappingNullReference ? null : Target.VBE); }
+            get { return new VBE(IsBroken ? null : Target.VBE); }
         }
 
         public override bool Equals(ISafeComWrapper<VB.Reference> other)
@@ -89,7 +89,7 @@ public bool Equals(IReference other)
 
         public override int GetHashCode()
         {
-            return IsWrappingNullReference ? 0 : HashCode.Compute(Type, Name, Guid, FullPath, Major, Minor);
+            return IsBroken ? 0 : HashCode.Compute(Type, Name, Guid, FullPath, Major, Minor);
         }
     }
 }
diff --git a/Rubberduck.VBEEditor/SafeComWrappers/VBA/Reference.cs b/Rubberduck.VBEEditor/SafeComWrappers/VBA/Reference.cs
@@ -12,22 +12,22 @@ public Reference(VB.Reference target)
 
         public string Name
         {
-            get { return IsWrappingNullReference ? string.Empty : Target.Name; }
+            get { return IsBroken ? string.Empty : Target.Name; }
         }
 
         public string Guid
         {
-            get { return IsWrappingNullReference ? string.Empty : Target.Guid; }
+            get { return IsBroken ? string.Empty : Target.Guid; }
         }
 
         public int Major
         {
-            get { return IsWrappingNullReference ? 0 : Target.Major; }
+            get { return IsBroken ? 0 : Target.Major; }
         }
 
         public int Minor
         {
-            get { return IsWrappingNullReference ? 0 : Target.Minor; }
+            get { return IsBroken ? 0 : Target.Minor; }
         }
 
         public string Version
@@ -37,17 +37,17 @@ public string Version
 
         public string Description
         {
-            get { return IsWrappingNullReference ? string.Empty : Target.Description; }
+            get { return IsBroken ? string.Empty : Target.Description; }
         }
 
         public string FullPath
         {
-            get { return IsWrappingNullReference ? string.Empty : Target.FullPath; }
+            get { return IsBroken ? string.Empty : Target.FullPath; }
         }
 
         public bool IsBuiltIn
         {
-            get { return !IsWrappingNullReference && Target.BuiltIn; }
+            get { return !IsBroken && Target.BuiltIn; }
         }
 
         public bool IsBroken
@@ -57,17 +57,17 @@ public bool IsBroken
 
         public ReferenceKind Type
         {
-            get { return IsWrappingNullReference ? 0 : (ReferenceKind)Target.Type; }
+            get { return IsBroken ? 0 : (ReferenceKind)Target.Type; }
         }
 
         public IReferences Collection
         {
-            get { return new References(IsWrappingNullReference ? null : Target.Collection); }
+            get { return new References(IsBroken ? null : Target.Collection); }
         }
 
         public IVBE VBE
         {
-            get { return new VBE(IsWrappingNullReference ? null : Target.VBE); }
+            get { return new VBE(IsBroken ? null : Target.VBE); }
         }
 
         public override bool Equals(ISafeComWrapper<VB.Reference> other)
@@ -89,7 +89,7 @@ public bool Equals(IReference other)
 
         public override int GetHashCode()
         {
-            return IsWrappingNullReference ? 0 : HashCode.Compute(Type, Name, Guid, FullPath, Major, Minor);
+            return IsBroken ? 0 : HashCode.Compute(Type, Name, Guid, FullPath, Major, Minor);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,22 +12,22 @@ public Reference(VB.Reference target)`
`12`	`12`
`13`	`13`	`public string Name`
`14`	`14`	`{`
`15`		`- get { return IsWrappingNullReference ? string.Empty : Target.Name; }`
	`15`	`+ get { return IsBroken ? string.Empty : Target.Name; }`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public string Guid`
`19`	`19`	`{`
`20`		`- get { return IsWrappingNullReference ? string.Empty : Target.Guid; }`
	`20`	`+ get { return IsBroken ? string.Empty : Target.Guid; }`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public int Major`
`24`	`24`	`{`
`25`		`- get { return IsWrappingNullReference ? 0 : Target.Major; }`
	`25`	`+ get { return IsBroken ? 0 : Target.Major; }`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public int Minor`
`29`	`29`	`{`
`30`		`- get { return IsWrappingNullReference ? 0 : Target.Minor; }`
	`30`	`+ get { return IsBroken ? 0 : Target.Minor; }`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public string Version`
`@@ -37,17 +37,17 @@ public string Version`
`37`	`37`
`38`	`38`	`public string Description`
`39`	`39`	`{`
`40`		`- get { return IsWrappingNullReference ? string.Empty : Target.Description; }`
	`40`	`+ get { return IsBroken ? string.Empty : Target.Description; }`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public string FullPath`
`44`	`44`	`{`
`45`		`- get { return IsWrappingNullReference ? string.Empty : Target.FullPath; }`
	`45`	`+ get { return IsBroken ? string.Empty : Target.FullPath; }`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public bool IsBuiltIn`
`49`	`49`	`{`
`50`		`- get { return !IsWrappingNullReference && Target.BuiltIn; }`
	`50`	`+ get { return !IsBroken && Target.BuiltIn; }`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public bool IsBroken`
`@@ -57,17 +57,17 @@ public bool IsBroken`
`57`	`57`
`58`	`58`	`public ReferenceKind Type`
`59`	`59`	`{`
`60`		`- get { return IsWrappingNullReference ? 0 : (ReferenceKind)Target.Type; }`
	`60`	`+ get { return IsBroken ? 0 : (ReferenceKind)Target.Type; }`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public IReferences Collection`
`64`	`64`	`{`
`65`		`- get { return new References(IsWrappingNullReference ? null : Target.Collection); }`
	`65`	`+ get { return new References(IsBroken ? null : Target.Collection); }`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public IVBE VBE`
`69`	`69`	`{`
`70`		`- get { return new VBE(IsWrappingNullReference ? null : Target.VBE); }`
	`70`	`+ get { return new VBE(IsBroken ? null : Target.VBE); }`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public override bool Equals(ISafeComWrapper<VB.Reference> other)`
`@@ -89,7 +89,7 @@ public bool Equals(IReference other)`
`89`	`89`
`90`	`90`	`public override int GetHashCode()`
`91`	`91`	`{`
`92`		`- return IsWrappingNullReference ? 0 : HashCode.Compute(Type, Name, Guid, FullPath, Major, Minor);`
	`92`	`+ return IsBroken ? 0 : HashCode.Compute(Type, Name, Guid, FullPath, Major, Minor);`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`	`}`