Merge branch 'next' into Issue1788

Hosch250 · web-flow · commit 2aeeb08bcfa2 · 2016-06-14T19:06:00.000-05:00
diff --git a/License.rtf b/License.rtf
@@ -46,7 +46,7 @@
 {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid12126636 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 
 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid12126636 Rubberduck is a COM add-in for the VBA IDE (VBE).
 \par 
-\par Copyright (C) 2014-2015 Mathieu Guindon & Christopher McClellan
+\par Copyright (C) 2014-2016 Mathieu Guindon & Christopher McClellan
 \par 
 \par This program is free software: you can redistribute it and/or modify
 \par it under the terms of the GNU General Public License as published by
@@ -845,4 +845,4 @@ ffffffffffffffffffffffffffffffff52006f006f007400200045006e0074007200790000000000
 40e4695ed001feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000105000000000000}}
+0000000000000000000000000000000000000000000000000105000000000000}}
diff --git a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs
@@ -28,6 +28,7 @@ public CodeExplorerViewModel(FolderHelper folderHelper, RubberduckParserState st
             _folderHelper = folderHelper;
             _state = state;
             _state.StateChanged += ParserState_StateChanged;
+            _state.ModuleStateChanged += ParserState_ModuleStateChanged;
 
             _refreshCommand = new DelegateCommand(param => _state.OnParseRequested(this),
                 param => !IsBusy && _state.IsDirty());
diff --git a/RetailCoder.VBE/UI/CodeExplorer/Commands/CodeExplorer_AddClassModuleCommand.cs b/RetailCoder.VBE/UI/CodeExplorer/Commands/CodeExplorer_AddClassModuleCommand.cs
@@ -7,14 +7,28 @@ namespace Rubberduck.UI.CodeExplorer.Commands
 {
     public class CodeExplorer_AddClassModuleCommand : CommandBase
     {
+        private readonly VBE _vbe;
+
+        public CodeExplorer_AddClassModuleCommand(VBE vbe)
+        {
+            _vbe = vbe;
+        }
+
         public override bool CanExecute(object parameter)
         {
-            return GetDeclaration(parameter) != null;
+            return GetDeclaration(parameter) != null || _vbe.VBProjects.Count == 1;
         }
 
         public override void Execute(object parameter)
         {
-            GetDeclaration(parameter).Project.VBComponents.Add(vbext_ComponentType.vbext_ct_ClassModule);
+            if (parameter != null)
+            {
+                GetDeclaration(parameter).Project.VBComponents.Add(vbext_ComponentType.vbext_ct_ClassModule);
+            }
+            else
+            {
+                _vbe.VBProjects.Item(1).VBComponents.Add(vbext_ComponentType.vbext_ct_ClassModule);
+            }
         }
 
         private Declaration GetDeclaration(object parameter)
diff --git a/RetailCoder.VBE/UI/CodeExplorer/Commands/CodeExplorer_AddStdModuleCommand.cs b/RetailCoder.VBE/UI/CodeExplorer/Commands/CodeExplorer_AddStdModuleCommand.cs
@@ -7,14 +7,28 @@ namespace Rubberduck.UI.CodeExplorer.Commands
 {
     public class CodeExplorer_AddStdModuleCommand : CommandBase
     {
+        private readonly VBE _vbe;
+
+        public CodeExplorer_AddStdModuleCommand(VBE vbe)
+        {
+            _vbe = vbe;
+        }
+
         public override bool CanExecute(object parameter)
         {
-            return GetDeclaration(parameter) != null;
+            return GetDeclaration(parameter) != null || _vbe.VBProjects.Count == 1;
         }
 
         public override void Execute(object parameter)
         {
-            GetDeclaration(parameter).Project.VBComponents.Add(vbext_ComponentType.vbext_ct_StdModule);
+            if (parameter != null)
+            {
+                GetDeclaration(parameter).Project.VBComponents.Add(vbext_ComponentType.vbext_ct_StdModule);
+            }
+            else
+            {
+                _vbe.VBProjects.Item(1).VBComponents.Add(vbext_ComponentType.vbext_ct_StdModule);
+            }
         }
 
         private Declaration GetDeclaration(object parameter)
diff --git a/RetailCoder.VBE/UI/CodeExplorer/Commands/CodeExplorer_AddTestModuleCommand.cs b/RetailCoder.VBE/UI/CodeExplorer/Commands/CodeExplorer_AddTestModuleCommand.cs
@@ -1,3 +1,4 @@
+using Microsoft.Vbe.Interop;
 using Rubberduck.Navigation.CodeExplorer;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.UI.Command;
@@ -7,21 +8,30 @@ namespace Rubberduck.UI.CodeExplorer.Commands
 {
     public class CodeExplorer_AddTestModuleCommand : CommandBase
     {
+        private readonly VBE _vbe;
         private readonly NewUnitTestModuleCommand _newUnitTestModuleCommand;
 
-        public CodeExplorer_AddTestModuleCommand(NewUnitTestModuleCommand newUnitTestModuleCommand)
+        public CodeExplorer_AddTestModuleCommand(VBE vbe, NewUnitTestModuleCommand newUnitTestModuleCommand)
         {
+            _vbe = vbe;
             _newUnitTestModuleCommand = newUnitTestModuleCommand;
         }
 
         public override bool CanExecute(object parameter)
         {
-            return GetDeclaration(parameter) != null;
+            return GetDeclaration(parameter) != null || _vbe.VBProjects.Count == 1;
         }
 
         public override void Execute(object parameter)
         {
-            _newUnitTestModuleCommand.NewUnitTestModule(GetDeclaration(parameter).Project);
+            if (parameter != null)
+            {
+                _newUnitTestModuleCommand.NewUnitTestModule(GetDeclaration(parameter).Project);
+            }
+            else
+            {
+                _newUnitTestModuleCommand.NewUnitTestModule(_vbe.VBProjects.Item(1));
+            }
         }
 
         private Declaration GetDeclaration(object parameter)
diff --git a/RetailCoder.VBE/UI/CodeExplorer/Commands/CodeExplorer_AddUserFormCommand.cs b/RetailCoder.VBE/UI/CodeExplorer/Commands/CodeExplorer_AddUserFormCommand.cs
@@ -7,14 +7,28 @@ namespace Rubberduck.UI.CodeExplorer.Commands
 {
     public class CodeExplorer_AddUserFormCommand : CommandBase
     {
+        private readonly VBE _vbe;
+
+        public CodeExplorer_AddUserFormCommand(VBE vbe)
+        {
+            _vbe = vbe;
+        }
+
         public override bool CanExecute(object parameter)
         {
-            return GetDeclaration(parameter) != null;
+            return GetDeclaration(parameter) != null || _vbe.VBProjects.Count == 1;
         }
 
         public override void Execute(object parameter)
         {
-            GetDeclaration(parameter).Project.VBComponents.Add(vbext_ComponentType.vbext_ct_MSForm);
+            if (parameter != null)
+            {
+                GetDeclaration(parameter).Project.VBComponents.Add(vbext_ComponentType.vbext_ct_MSForm);
+            }
+            else
+            {
+                _vbe.VBProjects.Item(1).VBComponents.Add(vbext_ComponentType.vbext_ct_MSForm);
+            }
         }
 
         private Declaration GetDeclaration(object parameter)
diff --git a/RubberduckTests/CodeExplorer/CodeExplorerTests.cs b/RubberduckTests/CodeExplorer/CodeExplorerTests.cs
@@ -36,7 +36,7 @@ public void AddStdModule()
             var mockHost = new Mock<IHostApplication>();
             mockHost.SetupAllProperties();
 
-            var commands = new List<ICommand> { new CodeExplorer_AddStdModuleCommand() };
+            var commands = new List<ICommand> { new CodeExplorer_AddStdModuleCommand(vbe.Object) };
 
             var state = new RubberduckParserState();
             var vm = new CodeExplorerViewModel(new FolderHelper(state, GetDelimiterConfigLoader()), state, commands);
@@ -64,7 +64,7 @@ public void AddClassModule()
             var mockHost = new Mock<IHostApplication>();
             mockHost.SetupAllProperties();
 
-            var commands = new List<ICommand> { new CodeExplorer_AddClassModuleCommand() };
+            var commands = new List<ICommand> { new CodeExplorer_AddClassModuleCommand(vbe.Object) };
 
             var state = new RubberduckParserState();
             var vm = new CodeExplorerViewModel(new FolderHelper(state, GetDelimiterConfigLoader()), state, commands);
@@ -92,7 +92,7 @@ public void AddUserForm()
             var mockHost = new Mock<IHostApplication>();
             mockHost.SetupAllProperties();
 
-            var commands = new List<ICommand> { new CodeExplorer_AddUserFormCommand() };
+            var commands = new List<ICommand> { new CodeExplorer_AddUserFormCommand(vbe.Object) };
 
             var state = new RubberduckParserState();
             var vm = new CodeExplorerViewModel(new FolderHelper(state, GetDelimiterConfigLoader()), state, commands);
@@ -126,7 +126,7 @@ public void AddTestModule()
             var state = new RubberduckParserState();
             var commands = new List<ICommand>
             {
-                new CodeExplorer_AddTestModuleCommand(new NewUnitTestModuleCommand(state, configLoader.Object))
+                new CodeExplorer_AddTestModuleCommand(vbe.Object, new NewUnitTestModuleCommand(state, configLoader.Object))
             };
 
             var vm = new CodeExplorerViewModel(new FolderHelper(state, GetDelimiterConfigLoader()), state, commands);

Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,28 @@ namespace Rubberduck.UI.CodeExplorer.Commands`
`7`	`7`	`{`
`8`	`8`	`public class CodeExplorer_AddClassModuleCommand : CommandBase`
`9`	`9`	`{`
	`10`	`+ private readonly VBE _vbe;`
	`11`	`+`
	`12`	`+ public CodeExplorer_AddClassModuleCommand(VBE vbe)`
	`13`	`+ {`
	`14`	`+ _vbe = vbe;`
	`15`	`+ }`
	`16`	`+`
`10`	`17`	`public override bool CanExecute(object parameter)`
`11`	`18`	`{`
`12`		`- return GetDeclaration(parameter) != null;`
	`19`	`+ return GetDeclaration(parameter) != null \|\| _vbe.VBProjects.Count == 1;`
`13`	`20`	`}`
`14`	`21`
`15`	`22`	`public override void Execute(object parameter)`
`16`	`23`	`{`
`17`		`- GetDeclaration(parameter).Project.VBComponents.Add(vbext_ComponentType.vbext_ct_ClassModule);`
	`24`	`+ if (parameter != null)`
	`25`	`+ {`
	`26`	`+ GetDeclaration(parameter).Project.VBComponents.Add(vbext_ComponentType.vbext_ct_ClassModule);`
	`27`	`+ }`
	`28`	`+ else`
	`29`	`+ {`
	`30`	`+ _vbe.VBProjects.Item(1).VBComponents.Add(vbext_ComponentType.vbext_ct_ClassModule);`
	`31`	`+ }`
`18`	`32`	`}`
`19`	`33`
`20`	`34`	`private Declaration GetDeclaration(object parameter)`
Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,28 @@ namespace Rubberduck.UI.CodeExplorer.Commands`
`7`	`7`	`{`
`8`	`8`	`public class CodeExplorer_AddStdModuleCommand : CommandBase`
`9`	`9`	`{`
	`10`	`+ private readonly VBE _vbe;`
	`11`	`+`
	`12`	`+ public CodeExplorer_AddStdModuleCommand(VBE vbe)`
	`13`	`+ {`
	`14`	`+ _vbe = vbe;`
	`15`	`+ }`
	`16`	`+`
`10`	`17`	`public override bool CanExecute(object parameter)`
`11`	`18`	`{`
`12`		`- return GetDeclaration(parameter) != null;`
	`19`	`+ return GetDeclaration(parameter) != null \|\| _vbe.VBProjects.Count == 1;`
`13`	`20`	`}`
`14`	`21`
`15`	`22`	`public override void Execute(object parameter)`
`16`	`23`	`{`
`17`		`- GetDeclaration(parameter).Project.VBComponents.Add(vbext_ComponentType.vbext_ct_StdModule);`
	`24`	`+ if (parameter != null)`
	`25`	`+ {`
	`26`	`+ GetDeclaration(parameter).Project.VBComponents.Add(vbext_ComponentType.vbext_ct_StdModule);`
	`27`	`+ }`
	`28`	`+ else`
	`29`	`+ {`
	`30`	`+ _vbe.VBProjects.Item(1).VBComponents.Add(vbext_ComponentType.vbext_ct_StdModule);`
	`31`	`+ }`
`18`	`32`	`}`
`19`	`33`
`20`	`34`	`private Declaration GetDeclaration(object parameter)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using Microsoft.Vbe.Interop;`
`1`	`2`	`using Rubberduck.Navigation.CodeExplorer;`
`2`	`3`	`using Rubberduck.Parsing.Symbols;`
`3`	`4`	`using Rubberduck.UI.Command;`
`@@ -7,21 +8,30 @@ namespace Rubberduck.UI.CodeExplorer.Commands`
`7`	`8`	`{`
`8`	`9`	`public class CodeExplorer_AddTestModuleCommand : CommandBase`
`9`	`10`	`{`
	`11`	`+ private readonly VBE _vbe;`
`10`	`12`	`private readonly NewUnitTestModuleCommand _newUnitTestModuleCommand;`
`11`	`13`
`12`		`- public CodeExplorer_AddTestModuleCommand(NewUnitTestModuleCommand newUnitTestModuleCommand)`
	`14`	`+ public CodeExplorer_AddTestModuleCommand(VBE vbe, NewUnitTestModuleCommand newUnitTestModuleCommand)`
`13`	`15`	`{`
	`16`	`+ _vbe = vbe;`
`14`	`17`	`_newUnitTestModuleCommand = newUnitTestModuleCommand;`
`15`	`18`	`}`
`16`	`19`
`17`	`20`	`public override bool CanExecute(object parameter)`
`18`	`21`	`{`
`19`		`- return GetDeclaration(parameter) != null;`
	`22`	`+ return GetDeclaration(parameter) != null \|\| _vbe.VBProjects.Count == 1;`
`20`	`23`	`}`
`21`	`24`
`22`	`25`	`public override void Execute(object parameter)`
`23`	`26`	`{`
`24`		`- _newUnitTestModuleCommand.NewUnitTestModule(GetDeclaration(parameter).Project);`
	`27`	`+ if (parameter != null)`
	`28`	`+ {`
	`29`	`+ _newUnitTestModuleCommand.NewUnitTestModule(GetDeclaration(parameter).Project);`
	`30`	`+ }`
	`31`	`+ else`
	`32`	`+ {`
	`33`	`+ _newUnitTestModuleCommand.NewUnitTestModule(_vbe.VBProjects.Item(1));`
	`34`	`+ }`
`25`	`35`	`}`
`26`	`36`
`27`	`37`	`private Declaration GetDeclaration(object parameter)`
Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,28 @@ namespace Rubberduck.UI.CodeExplorer.Commands`
`7`	`7`	`{`
`8`	`8`	`public class CodeExplorer_AddUserFormCommand : CommandBase`
`9`	`9`	`{`
	`10`	`+ private readonly VBE _vbe;`
	`11`	`+`
	`12`	`+ public CodeExplorer_AddUserFormCommand(VBE vbe)`
	`13`	`+ {`
	`14`	`+ _vbe = vbe;`
	`15`	`+ }`
	`16`	`+`
`10`	`17`	`public override bool CanExecute(object parameter)`
`11`	`18`	`{`
`12`		`- return GetDeclaration(parameter) != null;`
	`19`	`+ return GetDeclaration(parameter) != null \|\| _vbe.VBProjects.Count == 1;`
`13`	`20`	`}`
`14`	`21`
`15`	`22`	`public override void Execute(object parameter)`
`16`	`23`	`{`
`17`		`- GetDeclaration(parameter).Project.VBComponents.Add(vbext_ComponentType.vbext_ct_MSForm);`
	`24`	`+ if (parameter != null)`
	`25`	`+ {`
	`26`	`+ GetDeclaration(parameter).Project.VBComponents.Add(vbext_ComponentType.vbext_ct_MSForm);`
	`27`	`+ }`
	`28`	`+ else`
	`29`	`+ {`
	`30`	`+ _vbe.VBProjects.Item(1).VBComponents.Add(vbext_ComponentType.vbext_ct_MSForm);`
	`31`	`+ }`
`18`	`32`	`}`
`19`	`33`
`20`	`34`	`private Declaration GetDeclaration(object parameter)`