Fix chained calls

Hosch250 · Hosch250 · commit 7b74d485570d · 2018-08-01T18:29:22.000-05:00
diff --git a/Rubberduck.CodeAnalysis/Inspections/Concrete/ObsoleteCallStatementInspection.cs b/Rubberduck.CodeAnalysis/Inspections/Concrete/ObsoleteCallStatementInspection.cs
@@ -29,7 +29,8 @@ protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
             foreach (var context in Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line)))
             {
                 string lines;
-                using (var module = State.ProjectsProvider.Component(context.ModuleName).CodeModule)
+                using (var component = State.ProjectsProvider.Component(context.ModuleName))
+                using (var module = component.CodeModule)
                 {
                     lines = module.GetLines(context.Context.Start.Line,
                         context.Context.Stop.Line - context.Context.Start.Line + 1);
diff --git a/Rubberduck.CodeAnalysis/QuickFixes/IgnoreOnceQuickFix.cs b/Rubberduck.CodeAnalysis/QuickFixes/IgnoreOnceQuickFix.cs
@@ -32,7 +32,8 @@ public override void Fix(IInspectionResult result)
 
             int annotationLine;
             string codeLine;
-            using (var module = _state.ProjectsProvider.Component(result.QualifiedSelection.QualifiedName).CodeModule)
+            using (var component = _state.ProjectsProvider.Component(result.QualifiedSelection.QualifiedName))
+            using (var module = component.CodeModule)
             {
                 annotationLine = result.QualifiedSelection.Selection.StartLine;
                 while (annotationLine != 1 && module.GetLines(annotationLine - 1, 1).EndsWith(" _"))
diff --git a/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerComponentViewModel.cs b/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerComponentViewModel.cs
@@ -110,7 +110,8 @@ public CodeExplorerComponentViewModel(CodeExplorerItemViewModel parent, Declarat
 
         private bool ContainsBuiltinDocumentPropertiesProperty()
         {
-            using (var properties = _projectsProvider.Component(Declaration.QualifiedName.QualifiedModuleName).Properties)
+            using (var component = _projectsProvider.Component(Declaration.QualifiedName.QualifiedModuleName))
+            using (var properties = component.Properties)
             {
                 return properties.Any(item => item.Name == "BuiltinDocumentProperties");
             }
diff --git a/Rubberduck.Core/Navigation/RegexSearchReplace/RegexSearchReplace.cs b/Rubberduck.Core/Navigation/RegexSearchReplace/RegexSearchReplace.cs
@@ -89,7 +89,11 @@ private IEnumerable<RegexSearchResult> GetResultsFromModule(ICodeModule module,
 
         private void SetSelection(RegexSearchResult item)
         {
-            item.Module.CodePane.Selection = item.Selection;
+            using (var module = item.Module)
+            using (var codePane = module.CodePane)
+            {
+                codePane.Selection = item.Selection;
+            }
         }
 
         private List<RegexSearchResult> SearchSelection(string searchPattern)
diff --git a/Rubberduck.Core/UI/CodeExplorer/Commands/PrintCommand.cs b/Rubberduck.Core/UI/CodeExplorer/Commands/PrintCommand.cs
@@ -34,7 +34,8 @@ protected override bool EvaluateCanExecute(object parameter)
 
             try
             {
-                using (var codeModule = _projectsProvider.Component(node.Declaration.QualifiedName.QualifiedModuleName).CodeModule)
+                using (var component = _projectsProvider.Component(node.Declaration.QualifiedName.QualifiedModuleName))
+                using (var codeModule = component.CodeModule)
                 {
                     return codeModule.CountOfLines != 0;
                 }
@@ -55,10 +56,11 @@ protected override void OnExecute(object parameter)
                 qualifiedComponentName.ComponentName + ".txt");
 
             List<string> text;
-            using (var codeModule = _projectsProvider.Component(qualifiedComponentName).CodeModule)
+            using (var component = _projectsProvider.Component(qualifiedComponentName))
+            using (var codeModule = component.CodeModule)
             {
                 text = codeModule.GetLines(1, codeModule.CountOfLines)
-                    .Split(new[] {Environment.NewLine}, StringSplitOptions.None).ToList();
+                    .Split(new[] { Environment.NewLine }, StringSplitOptions.None).ToList();
             }
 
             var printDoc = new PrintDocument { DocumentName = path };
diff --git a/Rubberduck.Core/UI/Command/AddTestMethodExpectedErrorCommand.cs b/Rubberduck.Core/UI/Command/AddTestMethodExpectedErrorCommand.cs
@@ -93,7 +93,8 @@ protected override void OnExecute(object parameter)
                 {
                     var declaration = _state.GetTestModules().FirstOrDefault(f =>
                     {
-                        using (var thisModule = _state.ProjectsProvider.Component(f.QualifiedName.QualifiedModuleName).CodeModule)
+                        using (var component = _state.ProjectsProvider.Component(f.QualifiedName.QualifiedModuleName))
+                        using (var thisModule = component.CodeModule)
                         {
                             return thisModule.Equals(activeModule);
                         }
diff --git a/Rubberduck.Core/UI/Command/FindAllImplementationsCommand.cs b/Rubberduck.Core/UI/Command/FindAllImplementationsCommand.cs
@@ -173,7 +173,8 @@ private SearchResultsViewModel CreateViewModel(Declaration target)
 
         private string GetModuleLine(QualifiedModuleName module, int line)
         {
-            using (var codeModule = _state.ProjectsProvider.Component(module).CodeModule)
+            using (var component = _state.ProjectsProvider.Component(module))
+            using (var codeModule = component.CodeModule)
             {
                 return codeModule.GetLines(line, 1).Trim();
             }
diff --git a/Rubberduck.Core/UI/Command/FindAllReferencesCommand.cs b/Rubberduck.Core/UI/Command/FindAllReferencesCommand.cs
@@ -177,7 +177,8 @@ private SearchResultsViewModel CreateViewModel(Declaration declaration)
 
         private string GetModuleLine(QualifiedModuleName module, int line)
         {
-            using (var codeModule = _state.ProjectsProvider.Component(module).CodeModule)
+            using (var component = _state.ProjectsProvider.Component(module))
+            using (var codeModule = component.CodeModule)
             {
                 return codeModule.GetLines(line, 1).Trim();
             }
diff --git a/Rubberduck.Core/UI/Command/MenuItems/CommandBars/RubberduckCommandBar.cs b/Rubberduck.Core/UI/Command/MenuItems/CommandBars/RubberduckCommandBar.cs
@@ -64,7 +64,10 @@ private void OnSelectionChange(object sender, DeclarationChangedEventArgs e)
             if (string.IsNullOrEmpty(caption) && e.VBComponent != null)
             {
                 //Fallback caption for selections in the Project window.
-                caption = $"{e.VBComponent.ParentProject.Name}.{e.VBComponent.Name} ({e.VBComponent.Type})";
+                using (var parentProject = e.VBComponent.ParentProject)
+                {
+                    caption = $"{parentProject.Name}.{e.VBComponent.Name} ({e.VBComponent.Type})";
+                }
             }
 
             var refCount = e.Declaration?.References.Count() ?? 0;
diff --git a/Rubberduck.Core/UI/Command/NavigateCommand.cs b/Rubberduck.Core/UI/Command/NavigateCommand.cs
@@ -31,7 +31,8 @@ protected override void OnExecute(object parameter)
 
             try
             {
-                using (var codeModule = _projectsProvider.Component(param.QualifiedName).CodeModule)
+                using (var component = _projectsProvider.Component(param.QualifiedName))
+                using (var codeModule = component.CodeModule)
                 {
                     using (var codePane = codeModule.CodePane)
                     {
diff --git a/Rubberduck.Core/UI/IdentifierReferences/IdentifierReferencesListDockablePresenter.cs b/Rubberduck.Core/UI/IdentifierReferences/IdentifierReferencesListDockablePresenter.cs
@@ -31,7 +31,8 @@ private void BindTarget(Declaration target)
 
         private void OnNavigateIdentifierReference(IdentifierReference reference)
         {
-            using (var codeModule = _projectsProvider.Component(reference.QualifiedModuleName).CodeModule)
+            using (var component = _projectsProvider.Component(reference.QualifiedModuleName))
+            using (var codeModule = component.CodeModule)
             {
                 using (var codePane = codeModule.CodePane)
                 {
diff --git a/Rubberduck.Core/UI/IdentifierReferences/ImplementationsListDockablePresenter.cs b/Rubberduck.Core/UI/IdentifierReferences/ImplementationsListDockablePresenter.cs
@@ -33,7 +33,8 @@ private void BindTarget(IEnumerable<Declaration> implementations)
 
         private void OnNavigateImplementation(Declaration implementation)
         {
-            using (var codeModule = _projectsProvider.Component(implementation.QualifiedName.QualifiedModuleName).CodeModule)
+            using (var component = _projectsProvider.Component(implementation.QualifiedName.QualifiedModuleName))
+            using (var codeModule = component.CodeModule)
             {
                 using (var codePane = codeModule.CodePane)
                 {
diff --git a/Rubberduck.Core/UI/ToDoItems/ToDoExplorerViewModel.cs b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerViewModel.cs
@@ -150,7 +150,8 @@ public CommandBase RemoveCommand
                         return;
                     }
 
-                    using (var module = _state.ProjectsProvider.Component(_selectedItem.Selection.QualifiedName).CodeModule)
+                    using (var component = _state.ProjectsProvider.Component(_selectedItem.Selection.QualifiedName))
+                    using (var module = component.CodeModule)
                     {
                         var oldContent = module.GetLines(_selectedItem.Selection.Selection.StartLine, 1);
                         var newContent = oldContent.Remove(_selectedItem.Selection.Selection.StartColumn - 1);
diff --git a/Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs b/Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs
@@ -92,7 +92,8 @@ private IEnumerable<IAnnotation> FindAnnotations()
             }
 
             int lastDeclarationsSectionLine;
-            using (var codeModule = _state.ProjectsProvider.Component(_qualifiedModuleName).CodeModule)
+            using (var component = _state.ProjectsProvider.Component(_qualifiedModuleName))
+            using (var codeModule = component.CodeModule)
             {
                 lastDeclarationsSectionLine = codeModule.CountOfDeclarationLines;
             }
diff --git a/Rubberduck.Parsing/VBA/ComponentParseTask.cs b/Rubberduck.Parsing/VBA/ComponentParseTask.cs
@@ -72,20 +72,23 @@ public void Start(CancellationToken cancellationToken)
                 cancellationToken.ThrowIfCancellationRequested();
 
                 var attributesPassParseResults = RunAttributesPass(cancellationToken);
-                var rewriter = new MemberAttributesRewriter(_sourceCodeHandler, _projectsProvider.Component(_module).CodeModule, new TokenStreamRewriter(attributesPassParseResults.tokenStream ?? tokenStream));
-
-                var completedHandler = ParseCompleted;
-                if (completedHandler != null && !cancellationToken.IsCancellationRequested)
-                    completedHandler.Invoke(this, new ParseCompletionArgs
-                    {
-                        ParseTree = codePaneParseResults.tree,
-                        AttributesTree = attributesPassParseResults.tree,
-                        Tokens = codePaneParseResults.tokenStream,
-                        AttributesRewriter = rewriter,
-                        Attributes = attributesPassParseResults.attributes,
-                        Comments = comments,
-                        Annotations = annotationListener.Annotations
-                    });
+                using (var component = _projectsProvider.Component(_module))
+                {
+                    var rewriter = new MemberAttributesRewriter(_sourceCodeHandler, component.CodeModule, new TokenStreamRewriter(attributesPassParseResults.tokenStream ?? tokenStream));
+
+                    var completedHandler = ParseCompleted;
+                    if (completedHandler != null && !cancellationToken.IsCancellationRequested)
+                        completedHandler.Invoke(this, new ParseCompletionArgs
+                        {
+                            ParseTree = codePaneParseResults.tree,
+                            AttributesTree = attributesPassParseResults.tree,
+                            Tokens = codePaneParseResults.tokenStream,
+                            AttributesRewriter = rewriter,
+                            Attributes = attributesPassParseResults.attributes,
+                            Comments = comments,
+                            Annotations = annotationListener.Annotations
+                        });
+                }
             }
             catch (COMException exception)
             {
diff --git a/Rubberduck.Parsing/VBA/ParseErrorEventArgs.cs b/Rubberduck.Parsing/VBA/ParseErrorEventArgs.cs
@@ -19,7 +19,17 @@ public ParseErrorEventArgs(SyntaxErrorException exception, IVBComponent componen
 
         private readonly IVBComponent _component;
         public string ComponentName { get { return _component.Name; } }
-        public string ProjectName { get { return _component.Collection.Parent.Name; } }
+        public string ProjectName
+        {
+            get
+            {
+                using (var collection = _component.Collection)
+                using (var parent = collection.Parent)
+                {
+                    return parent.Name;
+                }
+            }
+        }
 
         public void Navigate()
         {
diff --git a/Rubberduck.Parsing/VBA/RubberduckParserState.cs b/Rubberduck.Parsing/VBA/RubberduckParserState.cs
@@ -834,7 +834,10 @@ private bool RemoveKeysFromCollections(IEnumerable<QualifiedModuleName> keys)
 
         public void AddTokenStream(QualifiedModuleName module, ITokenStream stream)
         {
-            _moduleStates[module].SetTokenStream(ProjectsProvider.Component(module).CodeModule, stream);
+            using (var component = ProjectsProvider.Component(module))
+            {
+                _moduleStates[module].SetTokenStream(component.CodeModule, stream);
+            }
             _moduleStates[module].SetModuleContentHashCode(GetModuleContentHash(module));
         }
 
diff --git a/Rubberduck.SmartIndenter/Indenter.cs b/Rubberduck.SmartIndenter/Indenter.cs
@@ -65,7 +65,11 @@ public void IndentCurrentModule()
                 {
                     return;
                 }
-                Indent(pane.CodeModule.Parent);
+
+                using (var module = pane.CodeModule)
+                {
+                    Indent(module.Parent);
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,8 @@ protected override IEnumerable<IInspectionResult> DoGetInspectionResults()`
`29`	`29`	`foreach (var context in Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line)))`
`30`	`30`	`{`
`31`	`31`	`string lines;`
`32`		`- using (var module = State.ProjectsProvider.Component(context.ModuleName).CodeModule)`
	`32`	`+ using (var component = State.ProjectsProvider.Component(context.ModuleName))`
	`33`	`+ using (var module = component.CodeModule)`
`33`	`34`	`{`
`34`	`35`	`lines = module.GetLines(context.Context.Start.Line,`
`35`	`36`	`context.Context.Stop.Line - context.Context.Start.Line + 1);`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ public override void Fix(IInspectionResult result)`
`32`	`32`
`33`	`33`	`int annotationLine;`
`34`	`34`	`string codeLine;`
`35`		`- using (var module = _state.ProjectsProvider.Component(result.QualifiedSelection.QualifiedName).CodeModule)`
	`35`	`+ using (var component = _state.ProjectsProvider.Component(result.QualifiedSelection.QualifiedName))`
	`36`	`+ using (var module = component.CodeModule)`
`36`	`37`	`{`
`37`	`38`	`annotationLine = result.QualifiedSelection.Selection.StartLine;`
`38`	`39`	`while (annotationLine != 1 && module.GetLines(annotationLine - 1, 1).EndsWith(" _"))`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,8 @@ public CodeExplorerComponentViewModel(CodeExplorerItemViewModel parent, Declarat`
`110`	`110`
`111`	`111`	`private bool ContainsBuiltinDocumentPropertiesProperty()`
`112`	`112`	`{`
`113`		`- using (var properties = _projectsProvider.Component(Declaration.QualifiedName.QualifiedModuleName).Properties)`
	`113`	`+ using (var component = _projectsProvider.Component(Declaration.QualifiedName.QualifiedModuleName))`
	`114`	`+ using (var properties = component.Properties)`
`114`	`115`	`{`
`115`	`116`	`return properties.Any(item => item.Name == "BuiltinDocumentProperties");`
`116`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,11 @@ private IEnumerable<RegexSearchResult> GetResultsFromModule(ICodeModule module,`
`89`	`89`
`90`	`90`	`private void SetSelection(RegexSearchResult item)`
`91`	`91`	`{`
`92`		`- item.Module.CodePane.Selection = item.Selection;`
	`92`	`+ using (var module = item.Module)`
	`93`	`+ using (var codePane = module.CodePane)`
	`94`	`+ {`
	`95`	`+ codePane.Selection = item.Selection;`
	`96`	`+ }`
`93`	`97`	`}`
`94`	`98`
`95`	`99`	`private List<RegexSearchResult> SearchSelection(string searchPattern)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ protected override bool EvaluateCanExecute(object parameter)`
`34`	`34`
`35`	`35`	`try`
`36`	`36`	`{`
`37`		`- using (var codeModule = _projectsProvider.Component(node.Declaration.QualifiedName.QualifiedModuleName).CodeModule)`
	`37`	`+ using (var component = _projectsProvider.Component(node.Declaration.QualifiedName.QualifiedModuleName))`
	`38`	`+ using (var codeModule = component.CodeModule)`
`38`	`39`	`{`
`39`	`40`	`return codeModule.CountOfLines != 0;`
`40`	`41`	`}`
`@@ -55,10 +56,11 @@ protected override void OnExecute(object parameter)`
`55`	`56`	`qualifiedComponentName.ComponentName + ".txt");`
`56`	`57`
`57`	`58`	`List<string> text;`
`58`		`- using (var codeModule = _projectsProvider.Component(qualifiedComponentName).CodeModule)`
	`59`	`+ using (var component = _projectsProvider.Component(qualifiedComponentName))`
	`60`	`+ using (var codeModule = component.CodeModule)`
`59`	`61`	`{`
`60`	`62`	`text = codeModule.GetLines(1, codeModule.CountOfLines)`
`61`		`- .Split(new[] {Environment.NewLine}, StringSplitOptions.None).ToList();`
	`63`	`+ .Split(new[] { Environment.NewLine }, StringSplitOptions.None).ToList();`
`62`	`64`	`}`
`63`	`65`
`64`	`66`	`var printDoc = new PrintDocument { DocumentName = path };`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,8 @@ protected override void OnExecute(object parameter)`
`93`	`93`	`{`
`94`	`94`	`var declaration = _state.GetTestModules().FirstOrDefault(f =>`
`95`	`95`	`{`
`96`		`- using (var thisModule = _state.ProjectsProvider.Component(f.QualifiedName.QualifiedModuleName).CodeModule)`
	`96`	`+ using (var component = _state.ProjectsProvider.Component(f.QualifiedName.QualifiedModuleName))`
	`97`	`+ using (var thisModule = component.CodeModule)`
`97`	`98`	`{`
`98`	`99`	`return thisModule.Equals(activeModule);`
`99`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,8 @@ private SearchResultsViewModel CreateViewModel(Declaration target)`
`173`	`173`
`174`	`174`	`private string GetModuleLine(QualifiedModuleName module, int line)`
`175`	`175`	`{`
`176`		`- using (var codeModule = _state.ProjectsProvider.Component(module).CodeModule)`
	`176`	`+ using (var component = _state.ProjectsProvider.Component(module))`
	`177`	`+ using (var codeModule = component.CodeModule)`
`177`	`178`	`{`
`178`	`179`	`return codeModule.GetLines(line, 1).Trim();`
`179`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,8 @@ private SearchResultsViewModel CreateViewModel(Declaration declaration)`
`177`	`177`
`178`	`178`	`private string GetModuleLine(QualifiedModuleName module, int line)`
`179`	`179`	`{`
`180`		`- using (var codeModule = _state.ProjectsProvider.Component(module).CodeModule)`
	`180`	`+ using (var component = _state.ProjectsProvider.Component(module))`
	`181`	`+ using (var codeModule = component.CodeModule)`
`181`	`182`	`{`
`182`	`183`	`return codeModule.GetLines(line, 1).Trim();`
`183`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,10 @@ private void OnSelectionChange(object sender, DeclarationChangedEventArgs e)`
`64`	`64`	`if (string.IsNullOrEmpty(caption) && e.VBComponent != null)`
`65`	`65`	`{`
`66`	`66`	`//Fallback caption for selections in the Project window.`
`67`		`- caption = $"{e.VBComponent.ParentProject.Name}.{e.VBComponent.Name} ({e.VBComponent.Type})";`
	`67`	`+ using (var parentProject = e.VBComponent.ParentProject)`
	`68`	`+ {`
	`69`	`+ caption = $"{parentProject.Name}.{e.VBComponent.Name} ({e.VBComponent.Type})";`
	`70`	`+ }`
`68`	`71`	`}`
`69`	`72`
`70`	`73`	`var refCount = e.Declaration?.References.Count() ?? 0;`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ protected override void OnExecute(object parameter)`
`31`	`31`
`32`	`32`	`try`
`33`	`33`	`{`
`34`		`- using (var codeModule = _projectsProvider.Component(param.QualifiedName).CodeModule)`
	`34`	`+ using (var component = _projectsProvider.Component(param.QualifiedName))`
	`35`	`+ using (var codeModule = component.CodeModule)`
`35`	`36`	`{`
`36`	`37`	`using (var codePane = codeModule.CodePane)`
`37`	`38`	`{`