merge upstream w/conflicts

Author: retailcoder

Rubberduck.Core/AddRemoveReferences/ReferenceModel.cs

@@ -5,6 +5,7 @@
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 using Rubberduck.Parsing.ComReflection;
+using Rubberduck.Parsing.ComReflection.TypeLibReflection;
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;

Rubberduck.Core/AddRemoveReferences/RegisteredLibraryFinderService.cs

@@ -5,6 +5,7 @@
 using System.Windows.Forms;
 using NLog;
 using Rubberduck.AddRemoveReferences;
+using Rubberduck.Parsing.ComReflection.TypeLibReflection;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Settings;

Rubberduck.Core/Properties/Settings.Designer.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using Rubberduck.Interaction;
+using Rubberduck.Parsing.ComReflection.TypeLibReflection;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.CodeAnalysis;
 using Rubberduck.Settings;
@@ -30,6 +31,7 @@ public class ReparseCommand : ComCommandBase
         private readonly IMessageBox _messageBox;
         private readonly RubberduckParserState _state;
         private readonly GeneralSettings _settings;
+        private static readonly ICachedTypeService TypeCacheService = CachedTypeService.Instance;
 
         public ReparseCommand(
             IVBE vbe, 
@@ -93,6 +95,10 @@ protected override void OnExecute(object parameter)
                     }
                 }
             }
+            foreach (var project in _state.Projects)
+            {
+                TypeCacheService.TryInvalidate(project.Name);
+            }
             _state.OnParseRequested(this);
         }
 

Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesPresenterFactory.cs

@@ -458,7 +458,7 @@
         <Setter Property="Foreground" Value="{Binding IsDimmed, Mode=OneWay, Converter={StaticResource BooleanToDimmed}}" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding IsObsolete}" Value="True">
-                <Setter Property="Foreground" Value="{StaticResource CaptionDisabledColor}" />
+                <Setter Property="Foreground" Value="{StaticResource CaptionDisabledBrush}" />
                 <Setter Property="TextDecorations" Value="Strikethrough" />
             </DataTrigger>
         </Style.Triggers>

Rubberduck.Core/UI/Command/ComCommands/ReparseCommand.cs

@@ -0,0 +1,195 @@
+using Moq;
+using Rubberduck.Resources.Registration;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// ReSharper disable InconsistentNaming
+
+namespace Rubberduck.ComClientLibrary.UnitTesting.Mocks
+{
+    [
+        ComVisible(true),
+        Guid(RubberduckGuid.ComMockGuid),
+        ProgId(RubberduckProgId.ComMockProgId),
+        ClassInterface(ClassInterfaceType.None),
+        ComDefaultInterface(typeof(IComMock))
+    ]
+    public class ComMock : IComMock
+    {
+        private readonly ComMocked mocked;
+        private readonly SetupArgumentResolver _resolver;
+        private readonly SetupExpressionBuilder _setupBuilder;
+        private readonly IMockProviderInternal _provider;
+
+        internal ComMock(IMockProviderInternal provider, string project, string progId, Mock mock, Type type, IEnumerable<Type> supportedInterfaces)
+        {
+            Project = project;
+            ProgId = progId;
+            Mock = mock;
+            _provider = provider;
+            _resolver = new SetupArgumentResolver();
+            _setupBuilder = new SetupExpressionBuilder(type, supportedInterfaces, _resolver);
+            MockedType = type;
+
+            Mock.As<IComMocked>().Setup(x => x.Mock).Returns(this);
+            mocked = new ComMocked(this, supportedInterfaces);
+        }
+
+        public string Project { get; }
+
+        public string ProgId { get; }
+
+        /// <remarks>
+        /// Refer to remarks in <see cref="SetupArgumentResolver.ResolveArgs"/> for how the
+        /// parameter <paramref name="Args"/> is handled. 
+        /// </remarks>
+        public void Setup(string Name, object Args = null)
+        {
+            var args = _resolver.ResolveArgs(Args);
+            var setupDatas = _setupBuilder.CreateExpression(Name, args);
+
+            foreach (var setupData in setupDatas)
+            {
+                var builder = MockExpressionBuilder.Create(Mock);
+                builder.As(setupData.DeclaringType)
+                    .Setup(setupData.SetupExpression, setupData.Args)
+                    .Execute();
+            }
+        }
+
+        /// <remarks>
+        /// Refer to remarks in <see cref="SetupArgumentResolver.ResolveArgs"/> for how the
+        /// parameter <paramref name="Args"/> is handled. 
+        /// </remarks>
+        public void SetupWithReturns(string Name, object Value, object Args = null)
+        {
+            var args = _resolver.ResolveArgs(Args);
+            var setupDatas = _setupBuilder.CreateExpression(Name, args);
+
+            foreach (var setupData in setupDatas)
+            {
+                var builder = MockExpressionBuilder.Create(Mock);
+                builder.As(setupData.DeclaringType)
+                    .Setup(setupData.SetupExpression, setupData.Args, setupData.ReturnType)
+                    .Returns(Value, setupData.ReturnType)
+                    .Execute();
+            }
+        }
+
+        /// <remarks>
+        /// Refer to remarks in <see cref="SetupArgumentResolver.ResolveArgs"/> for how the
+        /// parameter <paramref name="Args"/> is handled. 
+        /// </remarks>
+        public void SetupWithCallback(string Name, Action Callback, object Args = null)
+        {
+            var args = _resolver.ResolveArgs(Args);
+            var setupDatas = _setupBuilder.CreateExpression(Name, args);
+
+            foreach (var setupData in setupDatas)
+            {
+                var builder = MockExpressionBuilder.Create(Mock);
+                builder.As(setupData.DeclaringType)
+                    .Setup(setupData.SetupExpression, setupData.Args)
+                    .Callback(Callback)
+                    .Execute();
+            }
+        }
+
+        public IComMock SetupChildMock(string Name, object Args)
+        {
+            Type type;
+            var memberInfo = MockedType.GetMember(Name).FirstOrDefault();
+            if (memberInfo == null)
+            {
+                memberInfo = MockedType.GetInterfaces().SelectMany(face => face.GetMember(Name)).First();
+            }
+
+            switch (memberInfo)
+            {
+                case FieldInfo fieldInfo:
+                    type = fieldInfo.FieldType;
+                    break;
+                case PropertyInfo propertyInfo:
+                    type = propertyInfo.PropertyType;
+                    break;
+                case MethodInfo methodInfo:
+                    type = methodInfo.ReturnType;
+                    break;
+                default:
+                    throw new InvalidOperationException($"Couldn't resolve member {Name} and acquire a type to mock.");
+            }
+
+            var childMock = _provider.MockChildObject(this, type);
+            var target = GetMockedObject(childMock, type);
+            SetupWithReturns(Name, target, Args);
+
+            return childMock;
+        }
+
+        private object GetMockedObject(IComMock mock, Type type)
+        {
+            var pUnkSource = IntPtr.Zero;
+            var pUnkTarget = IntPtr.Zero;
+
+            try
+            {
+                pUnkSource = Marshal.GetIUnknownForObject(mock.Object);
+                var iid = type.GUID;
+                Marshal.QueryInterface(pUnkSource, ref iid, out pUnkTarget);
+                return Marshal.GetTypedObjectForIUnknown(pUnkTarget, type);
+            }
+            finally
+            {
+                if (pUnkTarget != IntPtr.Zero) Marshal.Release(pUnkTarget);
+                if (pUnkSource != IntPtr.Zero) Marshal.Release(pUnkSource);
+            }
+        }
+
+        public void Verify(string Name, ITimes Times, [MarshalAs(UnmanagedType.Struct), Optional] object Args)
+        {
+            var args = _resolver.ResolveArgs(Args);
+            var setupDatas = _setupBuilder.CreateExpression(Name, args);
+
+            var throwingExecutions = 0;
+            MockException lastException = null;
+            foreach (var setupData in setupDatas)
+            {
+                try
+                {
+                    var builder = MockExpressionBuilder.Create(Mock);
+                    builder.As(setupData.DeclaringType)
+                        .Verify(setupData.SetupExpression, Times, setupData.Args)
+                        .Execute();
+
+                    Rubberduck.UnitTesting.AssertHandler.OnAssertSucceeded();
+                }
+                catch (TargetInvocationException exception)
+                {
+                    if (exception.InnerException is MockException inner)
+                    {
+                        throwingExecutions++;
+                        lastException = inner;
+                    }
+                    else
+                    {
+                        throw;
+                    }
+                }
+            }
+            if (setupDatas.Count() == throwingExecutions)
+            {
+                // if all mocked interfaces failed the .Verify call, then none of them succeeded:
+                Rubberduck.UnitTesting.AssertHandler.OnAssertFailed(lastException.Message);
+            }
+        }
+
+        public object Object => mocked;
+
+        internal Mock Mock { get; }
+
+        internal Type MockedType { get; }
+    }
+}