Merge pull request #2551 from comintern/next

comintern · web-flow · commit 8536cd2123c6 · 2017-01-18T07:42:38.000-06:00
Start of QualifiedModuleName cleanup.
diff --git a/RetailCoder.VBE/Common/DeclarationExtensions.cs b/RetailCoder.VBE/Common/DeclarationExtensions.cs
@@ -364,8 +364,7 @@ public static IEnumerable<Declaration> FindFormEventHandlers(this RubberduckPars
             var items = state.AllDeclarations.ToList();
 
             var forms = items.Where(item => item.DeclarationType == DeclarationType.ClassModule
-                && item.QualifiedName.QualifiedModuleName.Component != null
-                && item.QualifiedName.QualifiedModuleName.Component.Type == ComponentType.UserForm)
+                && item.QualifiedName.QualifiedModuleName.ComponentType == ComponentType.UserForm)
                 .ToList();
 
             var result = new List<Declaration>();
diff --git a/RetailCoder.VBE/Inspections/ProcedureNotUsedInspection.cs b/RetailCoder.VBE/Inspections/ProcedureNotUsedInspection.cs
@@ -46,7 +46,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
             handlers.AddRange(withEventFields.SelectMany(Declarations.FindEventProcedures));
 
             var forms = declarations.Where(item => item.DeclarationType == DeclarationType.ClassModule
-                        && item.QualifiedName.QualifiedModuleName.Component.Type == ComponentType.UserForm)
+                        && item.QualifiedName.QualifiedModuleName.ComponentType == ComponentType.UserForm)
                 .ToList();
 
             if (forms.Any())
@@ -159,7 +159,7 @@ private IEnumerable<string> GetImplementedInterfaceMembers(IEnumerable<Declarati
         {
             var interfaces = classes.Where(item => item.References.Any(reference =>
                     ParserRuleContextHelper.HasParent<VBAParser.ImplementsStmtContext>(reference.Context.Parent)
-                    && reference.QualifiedModuleName.Component.Name == componentName));
+                    && reference.QualifiedModuleName.ComponentName == componentName));
 
             var members = interfaces.SelectMany(declarations.InScope)
                 .Select(member => member.ComponentName + "_" + member.IdentifierName);
diff --git a/RetailCoder.VBE/Inspections/QuickFixes/EncapsulateFieldQuickFix.cs b/RetailCoder.VBE/Inspections/QuickFixes/EncapsulateFieldQuickFix.cs
@@ -30,7 +30,7 @@ public EncapsulateFieldQuickFix(ParserRuleContext context, QualifiedSelection se
 
         public override void Fix()
         {
-            var vbe = Selection.QualifiedName.Project.VBE;
+            var vbe = _target.Project.VBE;
 
             using (var view = new EncapsulateFieldDialog(_state, _indenter))
             {
diff --git a/RetailCoder.VBE/Inspections/QuickFixes/MoveFieldCloserToUsageQuickFix.cs b/RetailCoder.VBE/Inspections/QuickFixes/MoveFieldCloserToUsageQuickFix.cs
@@ -28,7 +28,7 @@ public MoveFieldCloserToUsageQuickFix(ParserRuleContext context, QualifiedSelect
 
         public override void Fix()
         {
-            var vbe = Selection.QualifiedName.Project.VBE;
+            var vbe = _target.Project.VBE;
 
             var refactoring = new MoveCloserToUsageRefactoring(vbe, _state, _messageBox);
 
diff --git a/RetailCoder.VBE/Inspections/QuickFixes/RenameDeclarationQuickFix.cs b/RetailCoder.VBE/Inspections/QuickFixes/RenameDeclarationQuickFix.cs
@@ -29,7 +29,7 @@ public RenameDeclarationQuickFix(ParserRuleContext context, QualifiedSelection s
 
         public override void Fix()
         {
-            var vbe = Selection.QualifiedName.Project.VBE;
+            var vbe = _target.Project.VBE;
 
             using (var view = new RenameDialog())
             {
diff --git a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerComponentViewModel.cs b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerComponentViewModel.cs
@@ -123,7 +123,7 @@ public bool IsTestModule
 
         public override QualifiedSelection? QualifiedSelection { get { return _declaration.QualifiedSelection; } }
 
-        private ComponentType ComponentType { get { return _declaration.QualifiedName.QualifiedModuleName.Component.Type; } }
+        private ComponentType ComponentType { get { return _declaration.QualifiedName.QualifiedModuleName.ComponentType; } }
 
         private static readonly IDictionary<ComponentType, DeclarationType> DeclarationTypes = new Dictionary<ComponentType, DeclarationType>
         {
diff --git a/RetailCoder.VBE/UI/CodeExplorer/Commands/ExportCommand.cs b/RetailCoder.VBE/UI/CodeExplorer/Commands/ExportCommand.cs
@@ -38,7 +38,7 @@ protected override bool CanExecuteImpl(object parameter)
             try
             {
                 var node = (CodeExplorerComponentViewModel)parameter;
-                var componentType = node.Declaration.QualifiedName.QualifiedModuleName.Component.Type;
+                var componentType = node.Declaration.QualifiedName.QualifiedModuleName.ComponentType;
                 return _exportableFileExtensions.Select(s => s.Key).Contains(componentType);
             }
             catch (COMException)
diff --git a/RetailCoder.VBE/UI/CodeExplorer/Commands/ImportCommand.cs b/RetailCoder.VBE/UI/CodeExplorer/Commands/ImportCommand.cs
@@ -48,26 +48,28 @@ protected override void ExecuteImpl(object parameter)
                 }
             }
 
-            if (_openFileDialog.ShowDialog() == DialogResult.OK)
+            if (project == null || _openFileDialog.ShowDialog() != DialogResult.OK)
             {
-                var fileExts = _openFileDialog.FileNames.Select(s => s.Split('.').Last());
-                if (fileExts.Any(fileExt => !new[] {"bas", "cls", "frm"}.Contains(fileExt)))
-                {
-                    return;
-                }
+                return;
+            }
 
-                foreach (var filename in _openFileDialog.FileNames)
-                {
-                    project.VBComponents.Import(filename);
-                }
+            var fileExts = _openFileDialog.FileNames.Select(s => s.Split('.').Last());
+            if (fileExts.Any(fileExt => !new[] {"bas", "cls", "frm"}.Contains(fileExt)))
+            {
+                return;
+            }
+
+            foreach (var filename in _openFileDialog.FileNames)
+            {
+                project.VBComponents.Import(filename);
             }
         }
 
         private IVBProject GetNodeProject(CodeExplorerItemViewModel parameter)
         {
             if (parameter is ICodeExplorerDeclarationViewModel)
             {
-                return parameter.GetSelectedDeclaration().QualifiedName.QualifiedModuleName.Project;
+                return parameter.GetSelectedDeclaration().Project;
             }
 
             var node = parameter.Parent;
@@ -76,7 +78,7 @@ private IVBProject GetNodeProject(CodeExplorerItemViewModel parameter)
                 node = node.Parent;
             }
 
-            return ((ICodeExplorerDeclarationViewModel)node).Declaration.QualifiedName.QualifiedModuleName.Project;
+            return ((ICodeExplorerDeclarationViewModel)node).Declaration.Project;
         }
 
         public void Dispose()
diff --git a/RetailCoder.VBE/UI/CodeExplorer/Commands/RemoveCommand.cs b/RetailCoder.VBE/UI/CodeExplorer/Commands/RemoveCommand.cs
@@ -39,7 +39,7 @@ protected override bool CanExecuteImpl(object parameter)
             }
 
             var node = (CodeExplorerComponentViewModel)parameter;
-            var componentType = node.Declaration.QualifiedName.QualifiedModuleName.Component.Type;
+            var componentType = node.Declaration.QualifiedName.QualifiedModuleName.ComponentType;
             return _exportableFileExtensions.Select(s => s.Key).Contains(componentType);
         }
 
@@ -64,7 +64,7 @@ protected override void ExecuteImpl(object parameter)
             // I know this will never be null because of the CanExecute
             var declaration = ((CodeExplorerComponentViewModel)parameter).Declaration;
 
-            var components = declaration.QualifiedName.QualifiedModuleName.Project.VBComponents;
+            var components = declaration.Project.VBComponents;
             components.Remove(declaration.QualifiedName.QualifiedModuleName.Component);
         }
 
diff --git a/Rubberduck.Parsing/Symbols/Declaration.cs b/Rubberduck.Parsing/Symbols/Declaration.cs
@@ -141,6 +141,7 @@ public Declaration(
             Attributes attributes = null)
         {
             _qualifiedName = qualifiedName;
+            _project = qualifiedName.QualifiedModuleName.Project;
             _parentDeclaration = parentDeclaration;
             _parentScopeDeclaration = _parentDeclaration;
             _parentScope = parentScope ?? string.Empty;
@@ -174,22 +175,23 @@ public Declaration(
         }
 
         public Declaration(ComEnumeration enumeration, Declaration parent, QualifiedModuleName module) : this(
-                module.QualifyMemberName(enumeration.Name),
-                parent,
-                parent,
-                "Long",     //Match the VBA default type declaration.  Technically these *can* be a LongLong on 64 bit systems, but would likely crash the VBE... 
-                null,
-                false,
-                false,
-                Accessibility.Global,
-                DeclarationType.Enumeration,
-                null,
-                Selection.Home,
-                false,
-                null,
-                true,
-                null,
-                new Attributes()) { }
+            module.QualifyMemberName(enumeration.Name),
+            parent,
+            parent,
+            "Long",
+            //Match the VBA default type declaration.  Technically these *can* be a LongLong on 64 bit systems, but would likely crash the VBE... 
+            null,
+            false,
+            false,
+            Accessibility.Global,
+            DeclarationType.Enumeration,
+            null,
+            Selection.Home,
+            false,
+            null,
+            true,
+            null,
+            new Attributes()) { }
 
         public Declaration(ComStruct structure, Declaration parent, QualifiedModuleName module)
             : this(
@@ -247,9 +249,9 @@ private string FolderFromAnnotations()
                 string result;
                 if (@namespace == null)
                 {
-                    result = _qualifiedName.QualifiedModuleName.Project == null
+                    result = string.IsNullOrEmpty(_qualifiedName.QualifiedModuleName.ProjectName)
                         ? _projectId
-                        : _qualifiedName.QualifiedModuleName.Project.Name;
+                        : _qualifiedName.QualifiedModuleName.ProjectName;
                 }
                 else
                 {
@@ -404,13 +406,14 @@ public void AddReference(
 
         public QualifiedSelection QualifiedSelection { get { return new QualifiedSelection(_qualifiedName.QualifiedModuleName, _selection); } }
 
+        private readonly IVBProject _project;
         /// <summary>
         /// Gets a reference to the VBProject the declaration is made in.
         /// </summary>
         /// <remarks>
         /// This property is intended to differenciate identically-named VBProjects.
         /// </remarks>
-        public IVBProject Project { get { return _qualifiedName.QualifiedModuleName.Project; } }
+        public virtual IVBProject Project { get { return _project ?? _parentDeclaration.Project; } }
 
         private readonly string _projectId;
         /// <summary>
diff --git a/Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs b/Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs
@@ -51,9 +51,9 @@ public DeclarationSymbolsListener(
             if (declarationType == DeclarationType.ProceduralModule)
             {
                 _moduleDeclaration = new ProceduralModuleDeclaration(
-                    _qualifiedName.QualifyMemberName(_qualifiedName.Component.Name),
+                    _qualifiedName.QualifyMemberName(_qualifiedName.ComponentName),
                     projectDeclaration,
-                    _qualifiedName.Component.Name,
+                    _qualifiedName.ComponentName,
                     false,
                     FindAnnotations(),
                     moduleAttributes);
@@ -97,9 +97,9 @@ public DeclarationSymbolsListener(
                 }
 
                 _moduleDeclaration = new ClassModuleDeclaration(
-                    _qualifiedName.QualifyMemberName(_qualifiedName.Component.Name),
+                    _qualifiedName.QualifyMemberName(_qualifiedName.ComponentName),
                     projectDeclaration,
-                    _qualifiedName.Component.Name,
+                    _qualifiedName.ComponentName,
                     false,
                     FindAnnotations(),
                     moduleAttributes,
diff --git a/Rubberduck.Parsing/Symbols/ProjectDeclaration.cs b/Rubberduck.Parsing/Symbols/ProjectDeclaration.cs
@@ -2,6 +2,7 @@
 using Rubberduck.VBEditor;
 using System.Collections.Generic;
 using System.Linq;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Parsing.Symbols
 {
@@ -12,7 +13,8 @@ public sealed class ProjectDeclaration : Declaration
         public ProjectDeclaration(
             QualifiedMemberName qualifiedName,
             string name,
-            bool isBuiltIn)
+            bool isBuiltIn,
+            IVBProject project)
             : base(
                   qualifiedName,
                   null,
@@ -29,11 +31,12 @@ public ProjectDeclaration(
                   null,
                   isBuiltIn)
         {
+            _project = project;
             _projectReferences = new List<ProjectReference>();
         }
 
         public ProjectDeclaration(ComProject project, QualifiedModuleName module)
-            : this(module.QualifyMemberName(project.Name), project.Name, true)
+            : this(module.QualifyMemberName(project.Name), project.Name, true, null)
         {
             MajorVersion = project.MajorVersion;
             MinorVersion = project.MinorVersion;
@@ -50,6 +53,15 @@ public IReadOnlyList<ProjectReference> ProjectReferences
             }
         }
 
+        private readonly IVBProject _project;
+        /// <summary>
+        /// Gets a reference to the VBProject the declaration is made in.
+        /// </summary>
+        /// <remarks>
+        /// This property is intended to differenciate identically-named VBProjects.
+        /// </remarks>
+        public override IVBProject Project { get { return _project; } }
+
         public void AddProjectReference(string referencedProjectId, int priority)
         {
             if (_projectReferences.Any(p => p.ReferencedProjectId == referencedProjectId))
diff --git a/Rubberduck.Parsing/Symbols/SerializableDeclaration.cs b/Rubberduck.Parsing/Symbols/SerializableDeclaration.cs
@@ -223,7 +223,7 @@ public Declaration Unwrap(Declaration parent)
             switch (DeclarationType)
             {
                 case DeclarationType.Project:
-                    return new ProjectDeclaration(QualifiedMemberName, IdentifierName, true);                    
+                    return new ProjectDeclaration(QualifiedMemberName, IdentifierName, true, null);                    
                 case DeclarationType.ClassModule:
                     return new ClassModuleDeclaration(QualifiedMemberName, parent, IdentifierName, true, annotations, attributes) { IsExtensible = IsExtensible };
                 case DeclarationType.ProceduralModule:
diff --git a/Rubberduck.Parsing/VBA/ParseCoordinator.cs b/Rubberduck.Parsing/VBA/ParseCoordinator.cs
@@ -628,7 +628,7 @@ private Declaration CreateProjectDeclaration(QualifiedModuleName projectQualifie
         {
             var qualifiedName = projectQualifiedName.QualifyMemberName(project.Name);
             var projectId = qualifiedName.QualifiedModuleName.ProjectId;
-            var projectDeclaration = new ProjectDeclaration(qualifiedName, project.Name, isBuiltIn: false);
+            var projectDeclaration = new ProjectDeclaration(qualifiedName, project.Name, false, project);
 
             var references = new List<ReferencePriorityMap>();
             foreach (var item in _projectReferences)
diff --git a/Rubberduck.Parsing/VBA/RubberduckParserState.cs b/Rubberduck.Parsing/VBA/RubberduckParserState.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -355,7 +354,7 @@ private ParserState EvaluateParserState()
             var moduleStates = new List<ParserState>();
             foreach (var moduleState in _moduleStates)
             {
-                if (moduleState.Key.Component == null || moduleState.Key.ComponentName == string.Empty)
+                if (moduleState.Key.Component == null || string.IsNullOrEmpty(moduleState.Key.ComponentName))
                 {
                     continue;
                 }
diff --git a/Rubberduck.SourceControl/SourceControlProviderBase.cs b/Rubberduck.SourceControl/SourceControlProviderBase.cs
@@ -173,11 +173,7 @@ public void ReloadComponent(string filePath)
                     var component = module.Parent;
                     {
                         var selection = new QualifiedSelection(new QualifiedModuleName(component), pane.Selection);
-                        string name = null;
-                        if (selection.QualifiedName.Component != null)
-                        {
-                            name = selection.QualifiedName.Component.Name;
-                        }
+                        var name = string.IsNullOrEmpty(selection.QualifiedName.ComponentName) ? null : selection.QualifiedName.ComponentName;
 
                         components.RemoveSafely(item);
 
@@ -217,12 +213,7 @@ private void Refresh()
                     var component = module.Parent;
                     {
                         var selection = new QualifiedSelection(new QualifiedModuleName(component), pane.Selection);
-                        string name = null;
-                        if (selection.QualifiedName.Component != null)
-                        {
-                            name = selection.QualifiedName.Component.Name;
-                        }
-
+                        var name = string.IsNullOrEmpty(selection.QualifiedName.ComponentName) ? null : selection.QualifiedName.ComponentName;
                         try
                         {
                             Project.LoadAllComponents(CurrentRepository.LocalLocation);
diff --git a/Rubberduck.VBEEditor/Application/AccessApp.cs b/Rubberduck.VBEEditor/Application/AccessApp.cs
@@ -46,7 +46,7 @@ private string GenerateMethodCall(QualifiedMemberName qualifiedMemberName)
             // http://msdn.microsoft.com/en-us/library/office/ff193559(v=office.15).aspx
             // https://github.com/retailcoder/Rubberduck/issues/109
 
-            var projectName = qualifiedMemberName.QualifiedModuleName.Project.Name;
+            var projectName = qualifiedMemberName.QualifiedModuleName.ProjectName;
             return string.Concat(projectName, ".", qualifiedMemberName.MemberName);
         }
     }
diff --git a/Rubberduck.VBEEditor/Application/PowerPointApp.cs b/Rubberduck.VBEEditor/Application/PowerPointApp.cs
@@ -25,7 +25,7 @@ private string GenerateMethodCall(QualifiedMemberName qualifiedMemberName)
                 // if project isn't saved yet, we can't qualify the method call: this only works with the active project.
                 return qualifiedMemberName.QualifiedModuleName.Component.VBE.ActiveVBProject.IsWrappingNullReference
                     ? null // if there's no active project, we can't generate the call
-                    : qualifiedMemberName.QualifiedModuleName.Component.Name + "." + qualifiedMemberName.MemberName;
+                    : qualifiedMemberName.QualifiedModuleName.ComponentName + "." + qualifiedMemberName.MemberName;
             }
 
             var moduleName = qualifiedMemberName.QualifiedModuleName.ComponentName;
diff --git a/Rubberduck.VBEEditor/Application/ProjectApp.cs b/Rubberduck.VBEEditor/Application/ProjectApp.cs
@@ -15,7 +15,7 @@ public override void Run(QualifiedMemberName qualifiedMemberName)
 
         protected virtual string GenerateMethodCall(QualifiedMemberName qualifiedMemberName)
         {
-            var moduleName = qualifiedMemberName.QualifiedModuleName.Component.Name;
+            var moduleName = qualifiedMemberName.QualifiedModuleName.ComponentName;
             return string.Concat(moduleName, ".", qualifiedMemberName.MemberName);
         }
     }
diff --git a/Rubberduck.VBEEditor/Application/Visio.cs b/Rubberduck.VBEEditor/Application/Visio.cs
@@ -22,7 +22,7 @@ public override void Run(QualifiedMemberName qualifiedMemberName)
         }
         protected virtual string GenerateMethodCall(QualifiedMemberName qualifiedMemberName)
         {
-            var moduleName = qualifiedMemberName.QualifiedModuleName.Component.Name;
+            var moduleName = qualifiedMemberName.QualifiedModuleName.ComponentName;
             return string.Concat(moduleName, ".", qualifiedMemberName.MemberName);
         }
     }
diff --git a/Rubberduck.VBEEditor/QualifiedModuleName.cs b/Rubberduck.VBEEditor/QualifiedModuleName.cs
diff --git a/Rubberduck.VBEEditor/SafeComWrappers/ComponentType.cs b/Rubberduck.VBEEditor/SafeComWrappers/ComponentType.cs
diff --git a/RubberduckTests/Inspections/ImplicitActiveSheetReferenceInspectionTests.cs b/RubberduckTests/Inspections/ImplicitActiveSheetReferenceInspectionTests.cs
diff --git a/RubberduckTests/Inspections/UntypedFunctionUsageInspectionTests.cs b/RubberduckTests/Inspections/UntypedFunctionUsageInspectionTests.cs
diff --git a/RubberduckTests/Symbols/AccessibilityCheckTests.cs b/RubberduckTests/Symbols/AccessibilityCheckTests.cs
diff --git a/RubberduckTests/Symbols/ClassModuleDeclarationTests.cs b/RubberduckTests/Symbols/ClassModuleDeclarationTests.cs
diff --git a/RubberduckTests/Symbols/ProceduralModuleDeclarationTests.cs b/RubberduckTests/Symbols/ProceduralModuleDeclarationTests.cs
diff --git a/RubberduckTests/Symbols/ProjectDeclarationTests.cs b/RubberduckTests/Symbols/ProjectDeclarationTests.cs

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public EncapsulateFieldQuickFix(ParserRuleContext context, QualifiedSelection se`
`30`	`30`
`31`	`31`	`public override void Fix()`
`32`	`32`	`{`
`33`		`- var vbe = Selection.QualifiedName.Project.VBE;`
	`33`	`+ var vbe = _target.Project.VBE;`
`34`	`34`
`35`	`35`	`using (var view = new EncapsulateFieldDialog(_state, _indenter))`
`36`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public MoveFieldCloserToUsageQuickFix(ParserRuleContext context, QualifiedSelect`
`28`	`28`
`29`	`29`	`public override void Fix()`
`30`	`30`	`{`
`31`		`- var vbe = Selection.QualifiedName.Project.VBE;`
	`31`	`+ var vbe = _target.Project.VBE;`
`32`	`32`
`33`	`33`	`var refactoring = new MoveCloserToUsageRefactoring(vbe, _state, _messageBox);`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public RenameDeclarationQuickFix(ParserRuleContext context, QualifiedSelection s`
`29`	`29`
`30`	`30`	`public override void Fix()`
`31`	`31`	`{`
`32`		`- var vbe = Selection.QualifiedName.Project.VBE;`
	`32`	`+ var vbe = _target.Project.VBE;`
`33`	`33`
`34`	`34`	`using (var view = new RenameDialog())`
`35`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public bool IsTestModule`
`123`	`123`
`124`	`124`	`public override QualifiedSelection? QualifiedSelection { get { return _declaration.QualifiedSelection; } }`
`125`	`125`
`126`		`- private ComponentType ComponentType { get { return _declaration.QualifiedName.QualifiedModuleName.Component.Type; } }`
	`126`	`+ private ComponentType ComponentType { get { return _declaration.QualifiedName.QualifiedModuleName.ComponentType; } }`
`127`	`127`
`128`	`128`	`private static readonly IDictionary<ComponentType, DeclarationType> DeclarationTypes = new Dictionary<ComponentType, DeclarationType>`
`129`	`129`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ protected override bool CanExecuteImpl(object parameter)`
`38`	`38`	`try`
`39`	`39`	`{`
`40`	`40`	`var node = (CodeExplorerComponentViewModel)parameter;`
`41`		`- var componentType = node.Declaration.QualifiedName.QualifiedModuleName.Component.Type;`
	`41`	`+ var componentType = node.Declaration.QualifiedName.QualifiedModuleName.ComponentType;`
`42`	`42`	`return _exportableFileExtensions.Select(s => s.Key).Contains(componentType);`
`43`	`43`	`}`
`44`	`44`	`catch (COMException)`
Original file line number	Diff line number	Diff line change
`@@ -48,26 +48,28 @@ protected override void ExecuteImpl(object parameter)`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`- if (_openFileDialog.ShowDialog() == DialogResult.OK)`
	`51`	`+ if (project == null \|\| _openFileDialog.ShowDialog() != DialogResult.OK)`
`52`	`52`	`{`
`53`		`- var fileExts = _openFileDialog.FileNames.Select(s => s.Split('.').Last());`
`54`		`- if (fileExts.Any(fileExt => !new[] {"bas", "cls", "frm"}.Contains(fileExt)))`
`55`		`- {`
`56`		`- return;`
`57`		`- }`
	`53`	`+ return;`
	`54`	`+ }`
`58`	`55`
`59`		`- foreach (var filename in _openFileDialog.FileNames)`
`60`		`- {`
`61`		`- project.VBComponents.Import(filename);`
`62`		`- }`
	`56`	`+ var fileExts = _openFileDialog.FileNames.Select(s => s.Split('.').Last());`
	`57`	`+ if (fileExts.Any(fileExt => !new[] {"bas", "cls", "frm"}.Contains(fileExt)))`
	`58`	`+ {`
	`59`	`+ return;`
	`60`	`+ }`
	`61`	`+`
	`62`	`+ foreach (var filename in _openFileDialog.FileNames)`
	`63`	`+ {`
	`64`	`+ project.VBComponents.Import(filename);`
`63`	`65`	`}`
`64`	`66`	`}`
`65`	`67`
`66`	`68`	`private IVBProject GetNodeProject(CodeExplorerItemViewModel parameter)`
`67`	`69`	`{`
`68`	`70`	`if (parameter is ICodeExplorerDeclarationViewModel)`
`69`	`71`	`{`
`70`		`- return parameter.GetSelectedDeclaration().QualifiedName.QualifiedModuleName.Project;`
	`72`	`+ return parameter.GetSelectedDeclaration().Project;`
`71`	`73`	`}`
`72`	`74`
`73`	`75`	`var node = parameter.Parent;`
`@@ -76,7 +78,7 @@ private IVBProject GetNodeProject(CodeExplorerItemViewModel parameter)`
`76`	`78`	`node = node.Parent;`
`77`	`79`	`}`
`78`	`80`
`79`		`- return ((ICodeExplorerDeclarationViewModel)node).Declaration.QualifiedName.QualifiedModuleName.Project;`
	`81`	`+ return ((ICodeExplorerDeclarationViewModel)node).Declaration.Project;`
`80`	`82`	`}`
`81`	`83`
`82`	`84`	`public void Dispose()`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ protected override bool CanExecuteImpl(object parameter)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`var node = (CodeExplorerComponentViewModel)parameter;`
`42`		`- var componentType = node.Declaration.QualifiedName.QualifiedModuleName.Component.Type;`
	`42`	`+ var componentType = node.Declaration.QualifiedName.QualifiedModuleName.ComponentType;`
`43`	`43`	`return _exportableFileExtensions.Select(s => s.Key).Contains(componentType);`
`44`	`44`	`}`
`45`	`45`
`@@ -64,7 +64,7 @@ protected override void ExecuteImpl(object parameter)`
`64`	`64`	`// I know this will never be null because of the CanExecute`
`65`	`65`	`var declaration = ((CodeExplorerComponentViewModel)parameter).Declaration;`
`66`	`66`
`67`		`- var components = declaration.QualifiedName.QualifiedModuleName.Project.VBComponents;`
	`67`	`+ var components = declaration.Project.VBComponents;`
`68`	`68`	`components.Remove(declaration.QualifiedName.QualifiedModuleName.Component);`
`69`	`69`	`}`
`70`	`70`