Merge pull request #1994 from Hosch250/parserUpdates

retailcoder · web-flow · commit 8fc93ecf60a5 · 2016-07-08T13:25:38.000-04:00
Get rid of single-component parse.  Fix bug in cache.  Fix bug in New…
diff --git a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs
@@ -32,8 +32,7 @@ public CodeExplorerViewModel(FolderHelper folderHelper, RubberduckParserState st
 
             _refreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param => _state.OnParseRequested(this),
                 param => !IsBusy && _state.IsDirty());
-
-            _refreshComponentCommand = commands.OfType<CodeExplorer_RefreshComponentCommand>().FirstOrDefault();
+            
             _navigateCommand = commands.OfType<CodeExplorer_NavigateCommand>().FirstOrDefault();
 
             _addTestModuleCommand = commands.OfType<CodeExplorer_AddTestModuleCommand>().FirstOrDefault();
@@ -413,9 +412,6 @@ private void SetErrorState(CodeExplorerItemViewModel itemNode, VBComponent compo
         private readonly CommandBase _refreshCommand;
         public CommandBase RefreshCommand { get { return _refreshCommand; } }
 
-        private readonly CommandBase _refreshComponentCommand;
-        public CommandBase RefreshComponentCommand { get { return _refreshComponentCommand; } }
-
         private readonly CommandBase _navigateCommand;
         public CommandBase NavigateCommand { get { return _navigateCommand; } }
 
diff --git a/RetailCoder.VBE/Rubberduck.csproj b/RetailCoder.VBE/Rubberduck.csproj
@@ -418,7 +418,6 @@
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_AddUserFormCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_CopyResultsCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_OpenProjectPropertiesCommand.cs" />
-    <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_RefreshComponentCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_RenameCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_FindAllReferencesCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_FindAllImplementationsCommand.cs" />
@@ -952,7 +951,7 @@
     <Compile Include="UnitTesting\AssertClass.cs" />
     <Compile Include="UnitTesting\AssertCompletedEventArgs.cs" />
     <Compile Include="UnitTesting\AssertHandler.cs" />
-    <Compile Include="UnitTesting\UnitTestHelpers.cs" />
+    <Compile Include="UnitTesting\UnitTestUtils.cs" />
     <Compile Include="UnitTesting\IAssert.cs" />
     <Compile Include="UnitTesting\ITestEngine.cs" />
     <Compile Include="UnitTesting\ITestRunner.cs" />
diff --git a/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml b/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml
@@ -357,9 +357,8 @@
             <Setter Property="ContextMenu">
                 <Setter.Value>
                     <ContextMenu DataContext="{Binding DataContext, Source={x:Reference CodeExplorer}}">
-                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_RefreshComponent}"
-                                  Command="{Binding RefreshComponentCommand}"
-                                  CommandParameter="{Binding SelectedItem}">
+                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Refresh}"
+                                  Command="{Binding RefreshCommand}">
                             <MenuItem.Icon>
                                 <Image Source="{StaticResource RefreshImage}" />
                             </MenuItem.Icon>
diff --git a/RetailCoder.VBE/UI/CodeExplorer/Commands/CodeExplorer_RefreshComponentCommand.cs b/RetailCoder.VBE/UI/CodeExplorer/Commands/CodeExplorer_RefreshComponentCommand.cs
diff --git a/RetailCoder.VBE/UI/RubberduckUI.Designer.cs b/RetailCoder.VBE/UI/RubberduckUI.Designer.cs
diff --git a/RetailCoder.VBE/UI/RubberduckUI.resx b/RetailCoder.VBE/UI/RubberduckUI.resx
@@ -1565,9 +1565,6 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
   <data name="SortStyle_ByCodeOrder" xml:space="preserve">
     <value>By code order</value>
   </data>
-  <data name="CodeExplorer_RefreshComponent" xml:space="preserve">
-    <value>Refresh component</value>
-  </data>
   <data name="TestOutcome_Ignored" xml:space="preserve">
     <value>Ignored</value>
   </data>
diff --git a/RetailCoder.VBE/UI/UnitTesting/TestExplorerModel.cs b/RetailCoder.VBE/UI/UnitTesting/TestExplorerModel.cs
@@ -31,7 +31,7 @@ private void State_StateChanged(object sender, ParserStateEventArgs e)
 
             _dispatcher.Invoke(() =>
             {
-                var tests = UnitTestHelpers.GetAllTests(_vbe, _state).ToList();
+                var tests = UnitTestUtils.GetAllTests(_vbe, _state).ToList();
 
                 var removedTests = Tests.Where(test =>
                              !tests.Any(t =>
diff --git a/RetailCoder.VBE/UnitTesting/NewTestMethodCommand.cs b/RetailCoder.VBE/UnitTesting/NewTestMethodCommand.cs
@@ -1,8 +1,6 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using Microsoft.Vbe.Interop;
-using Rubberduck.Parsing.Annotations;
-using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI;
 
@@ -68,12 +66,10 @@ public void NewTestMethod()
 
             try
             {
-                var declaration = _state.AllUserDeclarations.FirstOrDefault(f =>
+                var declaration = _state.GetTestModules().FirstOrDefault(f =>
                             f.QualifiedName.QualifiedModuleName.Component.CodeModule == _vbe.ActiveCodePane.CodeModule);
 
-                if (declaration != null &&
-                    declaration.DeclarationType == DeclarationType.ProceduralModule &&
-                    declaration.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule))
+                if (declaration != null)
                 {
                     var module = _vbe.ActiveCodePane.CodeModule;
                     var name = GetNextTestMethodName(module.Parent);
@@ -97,12 +93,10 @@ public void NewExpectedErrorTestMethod()
 
             try
             {
-                var declaration = _state.AllUserDeclarations.FirstOrDefault(f =>
+                var declaration = _state.GetTestModules().FirstOrDefault(f =>
                             f.QualifiedName.QualifiedModuleName.Component.CodeModule == _vbe.ActiveCodePane.CodeModule);
 
-                if (declaration != null &&
-                    declaration.DeclarationType == DeclarationType.ProceduralModule &&
-                    declaration.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule))
+                if (declaration != null)
                 {
                     var module = _vbe.ActiveCodePane.CodeModule;
                     var name = GetNextTestMethodName(module.Parent);
diff --git a/RetailCoder.VBE/UnitTesting/UnitTestUtils.cs b/RetailCoder.VBE/UnitTesting/UnitTestUtils.cs
@@ -8,7 +8,7 @@
 
 namespace Rubberduck.UnitTesting
 {
-    public static class UnitTestHelpers
+    public static class UnitTestUtils
     {
         public static IEnumerable<TestMethod> GetAllTests(VBE vbe, RubberduckParserState state)
         {
@@ -77,5 +77,12 @@ private static IEnumerable<Declaration> GetTestModuleProcedures(RubberduckParser
                         item.ParentDeclaration.DeclarationType == DeclarationType.ProceduralModule &&
                         item.ParentDeclaration.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule));
         }
+
+        public static IEnumerable<Declaration> GetTestModules(this RubberduckParserState state)
+        {
+            return state.AllUserDeclarations.Where(item =>
+                        item.DeclarationType == DeclarationType.ProceduralModule &&
+                        item.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule));
+        }
     }
 }
diff --git a/Rubberduck.Parsing/IRubberduckParser.cs b/Rubberduck.Parsing/IRubberduckParser.cs
@@ -1,12 +1,10 @@
 using System;
-using Microsoft.Vbe.Interop;
 using Rubberduck.Parsing.VBA;
 
 namespace Rubberduck.Parsing
 {
     public interface IRubberduckParser : IDisposable
     {
         RubberduckParserState State { get; }
-        void Cancel(VBComponent component = null);
     }
 }
diff --git a/Rubberduck.Parsing/VBA/RubberduckParser.cs b/Rubberduck.Parsing/VBA/RubberduckParser.cs
@@ -51,50 +51,10 @@ public RubberduckParser(
         // but the cancelees need to use their own token.
         private readonly List<CancellationTokenSource> _cancellationTokens = new List<CancellationTokenSource> {new CancellationTokenSource()};
 
-        private void ReparseRequested(object sender, ParseRequestEventArgs e)
+        private void ReparseRequested(object sender, EventArgs e)
         {
-            if (e.IsFullReparseRequest)
-            {
-                Cancel();
-                Task.Run(() => ParseAll(_cancellationTokens[0]));
-            }
-            else
-            {
-                Cancel(e.Component);
-                Task.Run(() =>
-                {
-                    State.SetModuleState(e.Component, ParserState.Pending);
-
-                    SyncComReferences(State.Projects);
-                    AddBuiltInDeclarations();
-
-                    if (_cancellationTokens[0].IsCancellationRequested)
-                    {
-                        return;
-                    }
-
-                    ParseAsync(e.Component, _cancellationTokens[0]).Wait();
-
-                    if (_cancellationTokens[0].IsCancellationRequested)
-                    {
-                        return;
-                    }
-
-                    if (State.Status == ParserState.Error) { return; }
-
-                    var qualifiedName = new QualifiedModuleName(e.Component);
-
-                    State.SetModuleState(e.Component, ParserState.ResolvingDeclarations);
-                    ResolveDeclarations(qualifiedName.Component,
-                        State.ParseTrees.Find(s => s.Key == qualifiedName).Value);
-                    
-                    if (State.Status < ParserState.Error)
-                    {
-                        State.SetStatusAndFireStateChanged(ParserState.ResolvedDeclarations);
-                        ResolveReferencesAsync(_cancellationTokens[0].Token);
-                    }
-                });
-            }
+            Cancel();
+            Task.Run(() => ParseAll(_cancellationTokens[0]));
         }
 
         /// <summary>
@@ -505,29 +465,15 @@ private Task ParseAsync(VBComponent component, CancellationTokenSource token, To
             return task;
         }
 
-        public void Cancel(VBComponent component = null)
+        private void Cancel()
         {
             lock (_cancellationTokens[0])
             {
-                if (component == null)
-                {
-                    _cancellationTokens[0].Cancel();
+                _cancellationTokens[0].Cancel();
 
-                    _cancellationTokens[0].Dispose();
-                    _cancellationTokens.Add(new CancellationTokenSource());
-                    _cancellationTokens.RemoveAt(0);
-                }
-                else
-                {
-                    _cancellationTokens[0].Cancel();
-                    
-                    Tuple<Task, CancellationTokenSource> result;
-                    if (_currentTasks.TryGetValue(component, out result))
-                    {
-                        result.Item2.Cancel();
-                        result.Item2.Dispose();
-                    }
-                }
+                _cancellationTokens[0].Dispose();
+                _cancellationTokens.Add(new CancellationTokenSource());
+                _cancellationTokens.RemoveAt(0);
             }
         }
 
diff --git a/Rubberduck.Parsing/VBA/RubberduckParserState.cs b/Rubberduck.Parsing/VBA/RubberduckParserState.cs
@@ -29,19 +29,6 @@ public ParserStateEventArgs(ParserState state)
         public ParserState State { get { return _state; } }
     }
 
-    public class ParseRequestEventArgs : EventArgs
-    {
-        private readonly VBComponent _component;
-
-        public ParseRequestEventArgs(VBComponent component)
-        {
-            _component = component;
-        }
-
-        public VBComponent Component { get { return _component; } }
-        public bool IsFullReparseRequest { get { return _component == null; } }
-    }
-
     public class RubberduckStatusMessageEventArgs : EventArgs
     {
         private readonly string _message;
@@ -63,7 +50,7 @@ public sealed class RubberduckParserState : IDisposable
         private readonly ConcurrentDictionary<QualifiedModuleName, ModuleState> _moduleStates =
             new ConcurrentDictionary<QualifiedModuleName, ModuleState>();
 
-        public event EventHandler<ParseRequestEventArgs> ParseRequest;
+        public event EventHandler<EventArgs> ParseRequest;
         public event EventHandler<RubberduckStatusMessageEventArgs> StatusMessageUpdate;
 
         private static readonly List<ParserState> States = new List<ParserState>();
@@ -217,15 +204,23 @@ public void OnStatusMessageUpdate(string message)
         /// </summary>
         public void RefreshProjects()
         {
-            _projects.Clear();
-            foreach (VBProject project in _vbe.VBProjects)
+            lock (_projects)
             {
-                if (string.IsNullOrEmpty(project.HelpFile) || _projects.Keys.Contains(project.HelpFile))
+                _projects.Clear();
+                foreach (VBProject project in _vbe.VBProjects)
                 {
-                    project.AssignProjectId();
-                }
+                    if (project.Protection == vbext_ProjectProtection.vbext_pp_locked)
+                    {
+                        continue;
+                    }
 
-                _projects.Add(project.HelpFile, project);
+                    if (string.IsNullOrEmpty(project.HelpFile) || _projects.Keys.Contains(project.HelpFile))
+                    {
+                        project.AssignProjectId();
+                    }
+
+                    _projects.Add(project.HelpFile, project);
+                }
             }
         }
 
@@ -861,7 +856,7 @@ public void OnParseRequested(object requestor, VBComponent component = null)
             var handler = ParseRequest;
             if (handler != null)
             {
-                var args = new ParseRequestEventArgs(component);
+                var args = EventArgs.Empty;
                 handler.Invoke(requestor, args);
             }
         }
diff --git a/RubberduckTests/UnitTesting/DiscoveryTests.cs b/RubberduckTests/UnitTesting/DiscoveryTests.cs
@@ -34,7 +34,7 @@ Public Sub TestMethod1()
             parser.Parse(new CancellationTokenSource());
             if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
 
-            Assert.AreEqual(1, UnitTestHelpers.GetAllTests(vbe.Object, parser.State).Count());
+            Assert.AreEqual(1, UnitTestUtils.GetAllTests(vbe.Object, parser.State).Count());
         }
 
         [TestMethod]
@@ -55,7 +55,7 @@ public void Discovery_IgnoresNonAnnotatedTestMethods()
             parser.Parse(new CancellationTokenSource());
             if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
 
-            Assert.IsFalse(UnitTestHelpers.GetAllTests(vbe.Object, parser.State).Any());
+            Assert.IsFalse(UnitTestUtils.GetAllTests(vbe.Object, parser.State).Any());
         }
 
         [TestMethod]
@@ -77,7 +77,7 @@ Public Sub TestMethod1()
             parser.Parse(new CancellationTokenSource());
             if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
 
-            Assert.IsFalse(UnitTestHelpers.GetAllTests(vbe.Object, parser.State).Any());
+            Assert.IsFalse(UnitTestUtils.GetAllTests(vbe.Object, parser.State).Any());
         }
 
         [TestMethod]

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ private void State_StateChanged(object sender, ParserStateEventArgs e)`
`31`	`31`
`32`	`32`	`_dispatcher.Invoke(() =>`
`33`	`33`	`{`
`34`		`- var tests = UnitTestHelpers.GetAllTests(_vbe, _state).ToList();`
	`34`	`+ var tests = UnitTestUtils.GetAllTests(_vbe, _state).ToList();`
`35`	`35`
`36`	`36`	`var removedTests = Tests.Where(test =>`
`37`	`37`	`!tests.Any(t =>`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace Rubberduck.UnitTesting`
`10`	`10`	`{`
`11`		`- public static class UnitTestHelpers`
	`11`	`+ public static class UnitTestUtils`
`12`	`12`	`{`
`13`	`13`	`public static IEnumerable<TestMethod> GetAllTests(VBE vbe, RubberduckParserState state)`
`14`	`14`	`{`
`@@ -77,5 +77,12 @@ private static IEnumerable<Declaration> GetTestModuleProcedures(RubberduckParser`
`77`	`77`	`item.ParentDeclaration.DeclarationType == DeclarationType.ProceduralModule &&`
`78`	`78`	`item.ParentDeclaration.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule));`
`79`	`79`	`}`
	`80`	`+`
	`81`	`+ public static IEnumerable<Declaration> GetTestModules(this RubberduckParserState state)`
	`82`	`+ {`
	`83`	`+ return state.AllUserDeclarations.Where(item =>`
	`84`	`+ item.DeclarationType == DeclarationType.ProceduralModule &&`
	`85`	`+ item.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule));`
	`86`	`+ }`
`80`	`87`	`}`
`81`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,10 @@`
`1`	`1`	`using System;`
`2`		`-using Microsoft.Vbe.Interop;`
`3`	`2`	`using Rubberduck.Parsing.VBA;`
`4`	`3`
`5`	`4`	`namespace Rubberduck.Parsing`
`6`	`5`	`{`
`7`	`6`	`public interface IRubberduckParser : IDisposable`
`8`	`7`	`{`
`9`	`8`	`RubberduckParserState State { get; }`
`10`		`- void Cancel(VBComponent component = null);`
`11`	`9`	`}`
`12`	`10`	`}`