Merge branch 'next' of https://github.com/retailcoder/Rubberduck.git

rubberduck-vba · Jan 24, 2017 · 0f5d369 · 0f5d369
2 parents 6ac2b02 + c9dd5fc
commit 0f5d369
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 30 deletions.
diff --git a/Rubberduck.Parsing/Preprocessing/LivelinessExpression.cs b/Rubberduck.Parsing/Preprocessing/LivelinessExpression.cs
@@ -16,44 +16,23 @@ public LivelinessExpression(IExpression isAlive, IExpression code)
 
         public override IValue Evaluate()
         {
-            bool isAlive = _isAlive.Evaluate().AsBool;
+            var isAlive = _isAlive.Evaluate().AsBool;
             var code = _code.Evaluate().AsString;
-            if (isAlive)
-            {
-                return new StringValue(code);
-            }
-            else
-            {
-                return new StringValue(MarkAsDead(code));
-            }
+            return isAlive ? new StringValue(code) : new StringValue(MarkAsDead(code));
         }
 
         private string MarkAsDead(string code)
         {
-            bool hasNewLine = false;
-            if (code.EndsWith(Environment.NewLine))
-            {
-                hasNewLine = true;
-            }
+            var hasNewLine = code.EndsWith(Environment.NewLine);
             // Remove parsed new line.
-            code = code.TrimEnd('\r', '\n');
-            var lines = code.Split(new string[] { Environment.NewLine }, StringSplitOptions.None);
+            code = code.Substring(0, code.Length - Environment.NewLine.Length);
+            var lines = code.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
             var result = string.Join(Environment.NewLine, lines.Select(_ => string.Empty));
             if (hasNewLine)
             {
                 result += Environment.NewLine;
             }
             return result;
         }
-
-        private string MarkLineAsDead(string line)
-        {
-            var result = string.Empty;
-            if (line.EndsWith(Environment.NewLine))
-            {
-                result += Environment.NewLine;
-            }
-            return result;
-        }
     }
 }
diff --git a/Rubberduck.Parsing/Symbols/DeclarationLoaders/AliasDeclarations.cs b/Rubberduck.Parsing/Symbols/DeclarationLoaders/AliasDeclarations.cs
@@ -56,7 +56,7 @@ public IReadOnlyList<Declaration> Load()
 
         private IReadOnlyList<Declaration> AddAliasDeclarations()
         {
-            var finder = new DeclarationFinder(_state.AllDeclarations, new IAnnotation[] { });
+            var finder = _state.DeclarationFinder;;
 
             if (WeHaveAlreadyLoadedTheDeclarationsBefore(finder))
             {

diff --git a/Rubberduck.Parsing/Symbols/DeclarationLoaders/DebugDeclarations.cs b/Rubberduck.Parsing/Symbols/DeclarationLoaders/DebugDeclarations.cs
@@ -18,7 +18,7 @@ public DebugDeclarations(RubberduckParserState state)
 
         public IReadOnlyList<Declaration> Load()
         {
-            var finder = new DeclarationFinder(_state.AllDeclarations, new IAnnotation[] { });
+            var finder = _state.DeclarationFinder;;
 
             if (WeHaveAlreadyLoadedTheDeclarationsBefore(finder))
             {

diff --git a/Rubberduck.Parsing/Symbols/DeclarationLoaders/FormEventDeclarations.cs b/Rubberduck.Parsing/Symbols/DeclarationLoaders/FormEventDeclarations.cs
@@ -28,7 +28,7 @@ public IReadOnlyList<Declaration> Load()
 
         private static Declaration FormsClassModuleFromParserState(RubberduckParserState state)
         {
-            var finder = new DeclarationFinder(state.AllDeclarations, new IAnnotation[] { });
+            var finder = state.DeclarationFinder;
 
             var msForms = finder.FindProject("MSForms");
             if (msForms == null)

diff --git a/Rubberduck.Parsing/Symbols/DeclarationLoaders/SpecialFormDeclarations.cs b/Rubberduck.Parsing/Symbols/DeclarationLoaders/SpecialFormDeclarations.cs
@@ -19,7 +19,7 @@ public SpecialFormDeclarations(RubberduckParserState state)
 
         public IReadOnlyList<Declaration> Load()
         {
-            var finder = new DeclarationFinder(_state.AllDeclarations, new IAnnotation[] { });
+            var finder = _state.DeclarationFinder;
 
             if (WeHaveAlreadyLoadedTheDeclarationsBefore(finder))
             {

diff --git a/Rubberduck.Parsing/VBA/ParseCoordinator.cs b/Rubberduck.Parsing/VBA/ParseCoordinator.cs
@@ -107,7 +107,10 @@ public void Parse(CancellationTokenSource token)
             }
 
             SyncComReferences(State.Projects);
+            State.RefreshFinder(_hostApp);
+
             AddBuiltInDeclarations();
+            State.RefreshFinder(_hostApp);
 
             foreach (var component in components)
             {
@@ -229,7 +232,10 @@ private void ParseAll(object requestor, CancellationTokenSource token)
             }
 
             SyncComReferences(State.Projects);
+            State.RefreshFinder(_hostApp);
+
             AddBuiltInDeclarations();
+            State.RefreshFinder(_hostApp);
 
             // invalidation cleanup should go into ParseAsync?
             foreach (var key in _componentAttributes.Keys)