Skip to content

Commit 423ac6b

Browse files
committed
Fix a few more chains
1 parent 7b74d48 commit 423ac6b

File tree

6 files changed

+14
-7
lines changed

6 files changed

+14
-7
lines changed

Rubberduck.Core/AutoComplete/AutoCompleteService.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@ private bool DeleteAroundCaret(AutoCompleteEventArgs e, IAutoComplete autoComple
157157
{
158158
var left = code.Substring(0, e.CurrentSelection.StartColumn - 2);
159159
var right = code.Substring(e.CurrentSelection.StartColumn);
160-
using (var pane = e.CodeModule.CodePane)
160+
using (var module = e.CodeModule)
161+
using (var pane = module.CodePane)
161162
{
162163
e.CodeModule.ReplaceLine(e.CurrentSelection.StartLine, left + right);
163164
pane.Selection = new Selection(e.CurrentSelection.StartLine, e.CurrentSelection.StartColumn - 1);

Rubberduck.Core/UI/Command/MenuItems/CommandBars/RubberduckCommandBar.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ private void OnSelectionChange(object sender, DeclarationChangedEventArgs e)
6464
if (string.IsNullOrEmpty(caption) && e.VBComponent != null)
6565
{
6666
//Fallback caption for selections in the Project window.
67-
using (var parentProject = e.VBComponent.ParentProject)
67+
using (var component = e.VBComponent)
68+
using (var parentProject = component.ParentProject)
6869
{
6970
caption = $"{parentProject.Name}.{e.VBComponent.Name} ({e.VBComponent.Type})";
7071
}

Rubberduck.Refactorings/ImplementInterface/ImplementInterfaceRefactoring.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ public void Refactor(QualifiedSelection selection)
8383

8484
if (oldSelection.HasValue)
8585
{
86-
using (var module = _state.ProjectsProvider.Component(oldSelection.Value.QualifiedName).CodeModule)
86+
using (var component = _state.ProjectsProvider.Component(oldSelection.Value.QualifiedName))
87+
using (var module = component.CodeModule)
8788
{
8889
using (var pane = module.CodePane)
8990
{

Rubberduck.Refactorings/IntroduceField/IntroduceFieldRefactoring.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ private void PromoteVariable(IModuleRewriter rewriter, Declaration target)
8686

8787
if (oldSelection.HasValue)
8888
{
89-
using (var module = _state.ProjectsProvider.Component(oldSelection.Value.QualifiedName).CodeModule)
89+
using (var component = _state.ProjectsProvider.Component(oldSelection.Value.QualifiedName))
90+
using (var module = component.CodeModule)
9091
{
9192
using (var pane = module.CodePane)
9293
{

Rubberduck.Refactorings/Rename/RenameRefactoring.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,8 @@ private bool IsValidTarget(Declaration target)
228228
}
229229
else if (target.DeclarationType.HasFlag(DeclarationType.Module))
230230
{
231-
using (var module = _state.ProjectsProvider.Component(target.QualifiedName.QualifiedModuleName).CodeModule)
231+
using (var component = _state.ProjectsProvider.Component(target.QualifiedName.QualifiedModuleName))
232+
using (var module = component.CodeModule)
232233
{
233234
if (module.IsWrappingNullReference)
234235
{
@@ -565,7 +566,8 @@ private IEnumerable<Declaration> FindEventHandlersForControl(Declaration control
565566

566567
private void CacheInitialSelection(QualifiedSelection qSelection)
567568
{
568-
using (var codeModule = _state.ProjectsProvider.Component(qSelection.QualifiedName).CodeModule)
569+
using (var component = _state.ProjectsProvider.Component(qSelection.QualifiedName))
570+
using (var codeModule = component.CodeModule)
569571
{
570572
using (var codePane = codeModule.CodePane)
571573
{

Rubberduck.Refactorings/ReorderParameters/ReorderParametersRefactoring.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@ private void AdjustReferences(IEnumerable<IdentifierReference> references)
154154
continue;
155155
}
156156

157-
using (var module = _projectsProvider.Component(reference.QualifiedModuleName).CodeModule)
157+
using (var component = _projectsProvider.Component(reference.QualifiedModuleName))
158+
using (var module = component.CodeModule)
158159
{
159160
RewriteCall(argumentList, module);
160161
}

0 commit comments

Comments
 (0)