Refactored/Inlined+deleted extension method "FindCodeModule"

retailcoder · retailcoder · commit 3a483871c60a · 2015-05-04T21:39:39.000-04:00
diff --git a/RetailCoder.VBE/Extensions/VbeExtensions.cs b/RetailCoder.VBE/Extensions/VbeExtensions.cs
@@ -7,11 +7,6 @@ namespace Rubberduck.Extensions
 {
     public static class VbeExtensions
     {
-        public static CodeModule FindCodeModule(this VBE vbe, QualifiedModuleName qualifiedName)
-        {
-            return qualifiedName.Component.CodeModule;
-        }
-
         public static void SetSelection(this VBE vbe, QualifiedSelection selection)
         {
             //not a very robust method. Breaks if there are multiple projects with the same name.
@@ -36,7 +31,7 @@ public static void SetSelection(this VBE vbe, QualifiedSelection selection)
 
         public static CodeModuleSelection FindInstruction(this VBE vbe, QualifiedModuleName qualifiedModuleName, Selection selection)
         {
-            var module = FindCodeModule(vbe, qualifiedModuleName);
+            var module = qualifiedModuleName.Component.CodeModule;
             if (module == null)
             {
                 return null;
diff --git a/RetailCoder.VBE/Inspections/AssignedByValParameterInspectionResult.cs b/RetailCoder.VBE/Inspections/AssignedByValParameterInspectionResult.cs
@@ -32,7 +32,7 @@ private void PassParameterByReference(VBE vbe)
             var newContent = string.Concat(Tokens.ByRef, " ", parameter.Replace(Tokens.ByVal, string.Empty).Trim());
             var selection = QualifiedSelection.Selection;
 
-            var module = vbe.FindCodeModule(QualifiedName);
+            var module = QualifiedName.Component.CodeModule;
             var lines = module.get_Lines(selection.StartLine, selection.LineCount);
 
             var result = lines.Replace(parameter, newContent);
diff --git a/RetailCoder.VBE/Inspections/IdentifierNotAssignedInspectionResult.cs b/RetailCoder.VBE/Inspections/IdentifierNotAssignedInspectionResult.cs
@@ -26,7 +26,7 @@ public override IDictionary<string, Action<VBE>> GetQuickFixes()
 
         protected override void RemoveUnusedDeclaration(VBE vbe)
         {
-            var module = vbe.FindCodeModule(QualifiedName);
+            var module = QualifiedName.Component.CodeModule;
             var selection = QualifiedSelection.Selection;
 
             var originalCodeLines = module.get_Lines(selection.StartLine, selection.LineCount)
diff --git a/RetailCoder.VBE/Inspections/IdentifierNotUsedInspectionResult.cs b/RetailCoder.VBE/Inspections/IdentifierNotUsedInspectionResult.cs
@@ -27,7 +27,7 @@ public override IDictionary<string, Action<VBE>> GetQuickFixes()
 
         protected virtual void RemoveUnusedDeclaration(VBE vbe)
         {
-            var module = vbe.FindCodeModule(QualifiedName);
+            var module = QualifiedName.Component.CodeModule;
             var selection = QualifiedSelection.Selection;
 
             var originalCodeLines = module.get_Lines(selection.StartLine, selection.LineCount)
diff --git a/RetailCoder.VBE/Inspections/ImplicitByRefParameterInspectionResult.cs b/RetailCoder.VBE/Inspections/ImplicitByRefParameterInspectionResult.cs
@@ -50,7 +50,7 @@ private void ChangeParameterPassing(VBE vbe, string newValue)
             var newContent = string.Concat(newValue, " ", parameter);
             var selection = QualifiedSelection.Selection;
 
-            var module = vbe.FindCodeModule(QualifiedName);
+            var module = QualifiedName.Component.CodeModule;
             var lines = module.get_Lines(selection.StartLine, selection.LineCount);
 
             var result = lines.Replace(parameter, newContent);
diff --git a/RetailCoder.VBE/Inspections/ImplicitPublicMemberInspectionResult.cs b/RetailCoder.VBE/Inspections/ImplicitPublicMemberInspectionResult.cs
@@ -31,7 +31,7 @@ private void SpecifyPublicModifier(VBE vbe)
 
             var selection = QualifiedSelection.Selection;
 
-            var module = vbe.FindCodeModule(QualifiedName);
+            var module = QualifiedName.Component.CodeModule;
             var lines = module.get_Lines(selection.StartLine, selection.LineCount);
 
             var result = lines.Replace(oldContent, newContent);
diff --git a/RetailCoder.VBE/Inspections/ImplicitVariantReturnTypeInspectionResult.cs b/RetailCoder.VBE/Inspections/ImplicitVariantReturnTypeInspectionResult.cs
@@ -39,7 +39,7 @@ private void ReturnExplicitVariant(VBE vbe)
             var procedure = Context.GetText();
             var result = procedure.Replace(signature, signature + ' ' + Tokens.As + ' ' + Tokens.Variant);
             
-            var module = vbe.FindCodeModule(QualifiedName);
+            var module = QualifiedName.Component.CodeModule;
             var selection = Context.GetSelection();
 
             module.DeleteLines(selection.StartLine, selection.LineCount);
diff --git a/RetailCoder.VBE/Inspections/MultipleDeclarationsInspectionResult.cs b/RetailCoder.VBE/Inspections/MultipleDeclarationsInspectionResult.cs
@@ -90,7 +90,7 @@ private void SplitDeclarations(VBE vbe)
                 }
             }
 
-            var module = vbe.FindCodeModule(QualifiedName);
+            var module = QualifiedName.Component.CodeModule;
             module.ReplaceLine(selection.StartLine, newContent.ToString());
         }
     }
diff --git a/RetailCoder.VBE/Inspections/NonReturningFunctionInspectionResult.cs b/RetailCoder.VBE/Inspections/NonReturningFunctionInspectionResult.cs
@@ -47,7 +47,7 @@ private void ConvertFunctionToProcedure(VBE vbe)
                 .Replace(Tokens.End + ' ' + Tokens.Function, Tokens.End + ' ' + Tokens.Sub)
                 .Replace(Tokens.Exit + ' ' + Tokens.Function, Tokens.Exit + ' ' + Tokens.Sub);
 
-            var module = vbe.FindCodeModule(QualifiedName);
+            var module = QualifiedName.Component.CodeModule;
             var selection = Context.GetSelection();
 
             module.DeleteLines(selection.StartLine, selection.LineCount);
diff --git a/RetailCoder.VBE/Inspections/ObsoleteCommentSyntaxInspectionResult.cs b/RetailCoder.VBE/Inspections/ObsoleteCommentSyntaxInspectionResult.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using Microsoft.Vbe.Interop;
 using Rubberduck.Extensions;
+using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Nodes;
 using Rubberduck.VBA;
@@ -28,7 +29,7 @@ public override IDictionary<string, Action<VBE>> GetQuickFixes()
 
         private void ReplaceWithSingleQuote(VBE vbe)
         {
-            var module = vbe.FindCodeModule(QualifiedName);
+            var module = QualifiedName.Component.CodeModule;
             if (module == null)
             {
                 return;
@@ -60,7 +61,7 @@ private void ReplaceWithSingleQuote(VBE vbe)
 
         private void RemoveComment(VBE vbe)
         {
-            var module = vbe.FindCodeModule(QualifiedName);
+            var module = QualifiedName.Component.CodeModule;
             if (module == null)
             {
                 return;
diff --git a/RetailCoder.VBE/Inspections/ObsoleteGlobalInspectionResult.cs b/RetailCoder.VBE/Inspections/ObsoleteGlobalInspectionResult.cs
@@ -26,7 +26,7 @@ public override IDictionary<string, Action<VBE>> GetQuickFixes()
 
         private void ChangeAccessModifier(VBE vbe)
         {
-            var module = vbe.FindCodeModule(QualifiedName);
+            var module = QualifiedName.Component.CodeModule;
             if (module == null)
             {
                 return;
diff --git a/RetailCoder.VBE/Inspections/ObsoleteLetStatementUsageInspectionResult.cs b/RetailCoder.VBE/Inspections/ObsoleteLetStatementUsageInspectionResult.cs
@@ -29,7 +29,7 @@ public override IDictionary<string, Action<VBE>> GetQuickFixes()
 
         private void RemoveObsoleteStatement(VBE vbe)
         {
-            var module = vbe.FindCodeModule(QualifiedName);
+            var module = QualifiedName.Component.CodeModule;
             if (module == null)
             {
                 return;
diff --git a/RetailCoder.VBE/Inspections/ObsoleteTypeHintInspectionResult.cs b/RetailCoder.VBE/Inspections/ObsoleteTypeHintInspectionResult.cs
@@ -45,7 +45,7 @@ private void RemoveTypeHints(VBE vbe)
             string hint;
             if (_declaration.HasTypeHint(out hint))
             {
-                var module = vbe.FindCodeModule(_declaration.QualifiedName.QualifiedModuleName);
+                var module = _declaration.QualifiedName.QualifiedModuleName.Component.CodeModule;
                 FixTypeHintUsage(hint, module, _declaration.Selection, true);
             }
 
@@ -55,7 +55,7 @@ private void RemoveTypeHints(VBE vbe)
                 string referenceHint;
                 if (reference.HasTypeHint(out referenceHint))
                 {
-                    var module = vbe.FindCodeModule(reference.QualifiedModuleName);
+                    var module = reference.QualifiedModuleName.Component.CodeModule;
                     FixTypeHintUsage(referenceHint, module, reference.Selection);
                 }
             }
diff --git a/RetailCoder.VBE/Inspections/OptionBaseInspectionResult.cs b/RetailCoder.VBE/Inspections/OptionBaseInspectionResult.cs
@@ -39,7 +39,7 @@ private void RebaseAllArrayReferences(VBE vbe)
 
         private void RemoveOptionStatement(VBE vbe)
         {
-            var module = vbe.FindCodeModule(QualifiedName);
+            var module = QualifiedName.Component.CodeModule;
             if (module == null)
             {
                 return;
diff --git a/RetailCoder.VBE/Inspections/OptionExplicitInspectionResult.cs b/RetailCoder.VBE/Inspections/OptionExplicitInspectionResult.cs
@@ -27,7 +27,7 @@ public override IDictionary<string, Action<VBE>> GetQuickFixes()
 
         private void SpecifyOptionExplicit(VBE vbe)
         {
-            var module = vbe.FindCodeModule(QualifiedName);
+            var module = QualifiedName.Component.CodeModule;
             if (module == null)
             {
                 return;
diff --git a/RetailCoder.VBE/Inspections/ParameterCanBeByValInspectionResult.cs b/RetailCoder.VBE/Inspections/ParameterCanBeByValInspectionResult.cs
@@ -31,7 +31,7 @@ private void PassParameterByValue(VBE vbe)
             var newContent = string.Concat(Tokens.ByVal, " ", parameter.Replace(Tokens.ByRef, string.Empty).Trim());
             var selection = QualifiedSelection.Selection;
 
-            var module = vbe.FindCodeModule(QualifiedName);
+            var module = QualifiedName.Component.CodeModule;
             var lines = module.get_Lines(selection.StartLine, selection.LineCount);
 
             var result = lines.Replace(parameter, newContent);
diff --git a/RetailCoder.VBE/Inspections/UnassignedVariableUsageInspectionResult.cs b/RetailCoder.VBE/Inspections/UnassignedVariableUsageInspectionResult.cs
@@ -27,7 +27,7 @@ public override IDictionary<string, Action<VBE>> GetQuickFixes()
 
         private void RemoveUsage(VBE vbe)
         {
-            var module = vbe.FindCodeModule(QualifiedName);
+            var module = QualifiedName.Component.CodeModule;
             var selection = QualifiedSelection.Selection;
 
             var originalCodeLines = module.get_Lines(selection.StartLine, selection.LineCount)
diff --git a/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerDockablePresenter.cs b/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerDockablePresenter.cs
@@ -133,7 +133,7 @@ private void ShowDesigner(object sender, EventArgs e)
             if (node != null && node.Tag != null)
             {
                 var selection = (Declaration)node.Tag;
-                var module = VBE.FindCodeModule(selection.QualifiedName.QualifiedModuleName);
+                var module = selection.QualifiedName.QualifiedModuleName.Component.CodeModule;
                 if (module == null)
                 {
                     return;
diff --git a/RetailCoder.VBE/UI/Refactorings/Rename/RenamePresenter.cs b/RetailCoder.VBE/UI/Refactorings/Rename/RenamePresenter.cs
@@ -82,7 +82,7 @@ private void RenameModule()
         {
             try
             {
-                var module = _vbe.FindCodeModule(_view.Target.QualifiedName.QualifiedModuleName);
+                var module = _view.Target.QualifiedName.QualifiedModuleName.Component.CodeModule;
                 if (module != null)
                 {
                     module.Name = _view.NewName;
@@ -118,7 +118,7 @@ private void RenameDeclaration()
                 return;
             }
 
-            var module = _vbe.FindCodeModule(_view.Target.QualifiedName.QualifiedModuleName);
+            var module = _view.Target.QualifiedName.QualifiedModuleName.Component.CodeModule;
             var newContent = GetReplacementLine(module, _view.Target, _view.NewName);
             module.ReplaceLine(_view.Target.Selection.StartLine, newContent);
         }
@@ -127,7 +127,7 @@ private void RenameControl()
         {
             try
             {
-                var form = _vbe.FindCodeModule(_view.Target.QualifiedName.QualifiedModuleName);
+                var form = _view.Target.QualifiedName.QualifiedModuleName.Component.CodeModule;
                 var control = ((dynamic) form.Parent.Designer).Controls(_view.Target.IdentifierName);
 
                 foreach (var handler in _declarations.FindEventHandlers(_view.Target))
@@ -183,7 +183,7 @@ private void RenameUsages()
             var modules = _view.Target.References.GroupBy(r => r.QualifiedModuleName);
             foreach (var grouping in modules)
             {
-                var module = _vbe.FindCodeModule(grouping.Key);
+                var module = grouping.Key.Component.CodeModule;
                 foreach (var line in grouping.GroupBy(reference => reference.Selection.StartLine))
                 {
                     var content = module.get_Lines(line.Key, 1);
diff --git a/RetailCoder.VBE/UI/UnitTesting/TestExplorerDockablePresenter.cs b/RetailCoder.VBE/UI/UnitTesting/TestExplorerDockablePresenter.cs
@@ -30,25 +30,25 @@ public TestExplorerDockablePresenter(VBE vbe, AddIn addin, IDockableUserControl
 
         private void TestEngineMethodCleanup(object sender, TestModuleEventArgs e)
         {
-            var module = VBE.FindCodeModule(e.QualifiedModuleName);
+            var module = e.QualifiedModuleName.Component.CodeModule;
             module.Parent.RunMethodsWithAttribute<TestCleanupAttribute>();
         }
 
         private void TestEngineMethodInitialize(object sender, TestModuleEventArgs e)
         {
-            var module = VBE.FindCodeModule(e.QualifiedModuleName);
+            var module = e.QualifiedModuleName.Component.CodeModule;
             module.Parent.RunMethodsWithAttribute<TestInitializeAttribute>();
         }
 
         private void _testEngine_ModuleCleanup(object sender, TestModuleEventArgs e)
         {
-            var module = VBE.FindCodeModule(e.QualifiedModuleName);
+            var module = e.QualifiedModuleName.Component.CodeModule;
             module.Parent.RunMethodsWithAttribute<ModuleCleanupAttribute>();
         }
 
         private void _testEngine_ModuleInitialize(object sender, TestModuleEventArgs e)
         {
-            var module = VBE.FindCodeModule(e.QualifiedModuleName);
+            var module = e.QualifiedModuleName.Component.CodeModule;
             module.Parent.RunMethodsWithAttribute<ModuleInitializeAttribute>();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,6 @@ namespace Rubberduck.Extensions`
`7`	`7`	`{`
`8`	`8`	`public static class VbeExtensions`
`9`	`9`	`{`
`10`		`- public static CodeModule FindCodeModule(this VBE vbe, QualifiedModuleName qualifiedName)`
`11`		`- {`
`12`		`- return qualifiedName.Component.CodeModule;`
`13`		`- }`
`14`		`-`
`15`	`10`	`public static void SetSelection(this VBE vbe, QualifiedSelection selection)`
`16`	`11`	`{`
`17`	`12`	`//not a very robust method. Breaks if there are multiple projects with the same name.`
`@@ -36,7 +31,7 @@ public static void SetSelection(this VBE vbe, QualifiedSelection selection)`
`36`	`31`
`37`	`32`	`public static CodeModuleSelection FindInstruction(this VBE vbe, QualifiedModuleName qualifiedModuleName, Selection selection)`
`38`	`33`	`{`
`39`		`- var module = FindCodeModule(vbe, qualifiedModuleName);`
	`34`	`+ var module = qualifiedModuleName.Component.CodeModule;`
`40`	`35`	`if (module == null)`
`41`	`36`	`{`
`42`	`37`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public override IDictionary<string, Action<VBE>> GetQuickFixes()`
`26`	`26`
`27`	`27`	`protected override void RemoveUnusedDeclaration(VBE vbe)`
`28`	`28`	`{`
`29`		`- var module = vbe.FindCodeModule(QualifiedName);`
	`29`	`+ var module = QualifiedName.Component.CodeModule;`
`30`	`30`	`var selection = QualifiedSelection.Selection;`
`31`	`31`
`32`	`32`	`var originalCodeLines = module.get_Lines(selection.StartLine, selection.LineCount)`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public override IDictionary<string, Action<VBE>> GetQuickFixes()`
`27`	`27`
`28`	`28`	`protected virtual void RemoveUnusedDeclaration(VBE vbe)`
`29`	`29`	`{`
`30`		`- var module = vbe.FindCodeModule(QualifiedName);`
	`30`	`+ var module = QualifiedName.Component.CodeModule;`
`31`	`31`	`var selection = QualifiedSelection.Selection;`
`32`	`32`
`33`	`33`	`var originalCodeLines = module.get_Lines(selection.StartLine, selection.LineCount)`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ private void SplitDeclarations(VBE vbe)`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`93`		`- var module = vbe.FindCodeModule(QualifiedName);`
	`93`	`+ var module = QualifiedName.Component.CodeModule;`
`94`	`94`	`module.ReplaceLine(selection.StartLine, newContent.ToString());`
`95`	`95`	`}`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using Microsoft.Vbe.Interop;`
`5`	`5`	`using Rubberduck.Extensions;`
	`6`	`+using Rubberduck.Parsing;`
`6`	`7`	`using Rubberduck.Parsing.Grammar;`
`7`	`8`	`using Rubberduck.Parsing.Nodes;`
`8`	`9`	`using Rubberduck.VBA;`
`@@ -28,7 +29,7 @@ public override IDictionary<string, Action<VBE>> GetQuickFixes()`
`28`	`29`
`29`	`30`	`private void ReplaceWithSingleQuote(VBE vbe)`
`30`	`31`	`{`
`31`		`- var module = vbe.FindCodeModule(QualifiedName);`
	`32`	`+ var module = QualifiedName.Component.CodeModule;`
`32`	`33`	`if (module == null)`
`33`	`34`	`{`
`34`	`35`	`return;`
`@@ -60,7 +61,7 @@ private void ReplaceWithSingleQuote(VBE vbe)`
`60`	`61`
`61`	`62`	`private void RemoveComment(VBE vbe)`
`62`	`63`	`{`
`63`		`- var module = vbe.FindCodeModule(QualifiedName);`
	`64`	`+ var module = QualifiedName.Component.CodeModule;`
`64`	`65`	`if (module == null)`
`65`	`66`	`{`
`66`	`67`	`return;`