Merge branch 'next' into Issue1770

Author: Hosch250

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

@@ -1647,4 +1647,10 @@ All our stargazers, likers & followers, for the warm fuzzies
   <data name="SourceControl_OpenCommandPromptFailureTitle" xml:space="preserve">
     <value>Failure opening command prompt</value>
   </data>
+  <data name="SourceControl_ActivateProject" xml:space="preserve">
+    <value>Please open or activate a project and try again.</value>
+  </data>
+  <data name="SourceControl_NoActiveProject" xml:space="preserve">
+    <value>No active VBProject</value>
+  </data>
 </root>

RetailCoder.VBE/UI/RubberduckUI.resx

@@ -818,11 +818,18 @@ private bool ValidRepoExists()
                 return false;
             }
 
-            var possibleRepos = _config.Repositories.Where(repo => repo.Id == _vbe.ActiveVBProject.HelpFile);
-            var possibleCount = possibleRepos.Count();
+            var project = _vbe.ActiveVBProject ?? (_vbe.VBProjects.Count == 1 ? _vbe.VBProjects.Item(1) : null);
 
-            //todo: if none are found, prompt user to create one
-            return possibleCount == 1;
+            if (project != null)
+            {
+                var possibleRepos = _config.Repositories.Where(repo => repo.Id == _vbe.ActiveVBProject.HelpFile);
+                return possibleRepos.Count() == 1;
+            }
+
+            ViewModel_ErrorThrown(this,
+                new ErrorEventArgs(RubberduckUI.SourceControl_NoActiveProject,
+                    RubberduckUI.SourceControl_ActivateProject, NotificationType.Error));
+            return false;
         }
 
         private void ShowFilePicker()

RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs

@@ -975,6 +975,22 @@ public void OnBrowseDefaultRepoLocation_WhenUserCancels_LocalDirectoryDoesNotCha
             Assert.AreEqual(originalPath, _vm.LocalDirectory);
         }
 
+        [TestMethod]
+        public void NullProject_DisplaysError()
+        {
+            //arrange
+            SetupValidVbProject();
+            SetupVM();
+            _vbe.Setup(v => v.ActiveVBProject).Returns((VBProject)null);
+            _vbe.Setup(v => v.VBProjects).Returns(new Mock<VBProjects>().Object);
+
+            //act
+            _vm.RefreshCommand.Execute(null);
+
+            //assert
+            Assert.IsTrue(_vm.DisplayErrorMessageGrid, "Null ActiveProject did not raise error.");
+        }
+
         private const string DummyRepoId = "SourceControlTest";
 
         private SourceControlSettings GetDummyConfig()