Merge pull request #119 from rubberduck-vba/next

sync with main repo

Author: retailcoder

RetailCoder.VBE/Common/ClipboardWriter.cs

@@ -5,12 +5,14 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Media.Imaging;
 
 namespace Rubberduck.Common
 {
     public interface IClipboardWriter
     {
         void Write(string text);
+        void AppendImage(BitmapSource image);
         void AppendString(string formatName, string data);
         void AppendStream(string formatName, MemoryStream stream);
         void Flush();
@@ -26,6 +28,16 @@ public void Write(string text)
             this.Flush();
         }
 
+        public void AppendImage(BitmapSource image)
+        {
+            if (_data == null)
+            {
+                _data = new DataObject();
+            }
+            _data.SetImage(image);
+        }
+
+
         public void AppendString(string formatName, string data)
         {
             if (_data == null)

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -3,6 +3,8 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
 using Microsoft.Vbe.Interop;
 using Rubberduck.Navigation.Folders;
 using Rubberduck.Parsing.Annotations;

RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml

@@ -703,8 +703,8 @@
                 </Button>
 
                 <Separator />
-                
-                <Button Command="{Binding CopyResultsCommand}">
+
+                <Button Command="{Binding CopyResultsCommand}" CommandParameter="{Binding ElementName=ProjectTree}">
                     <Image Height="16" Source="../../Resources/document-copy.png" />
                     <Button.ToolTip>
                         <TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_CopyToolTip}" />
@@ -714,11 +714,14 @@
             </ToolBar>
         </ToolBarTray>
 
-        <TreeView Grid.Row="1" Background="White"
+        <TreeView x:Name="ProjectTree"
+                  Grid.Row="1"
+                  Background="White"
                   ItemContainerStyle="{StaticResource ShinyTreeView}"
                   HorizontalContentAlignment="Stretch"
                   MouseDoubleClick="TreeView_OnMouseDoubleClick"
-                  Style="{StaticResource CodeExplorerTreeViewStyle}" BorderThickness="0,1">
+                  Style="{StaticResource CodeExplorerTreeViewStyle}" BorderThickness="0,1"
+                  VirtualizingPanel.IsVirtualizing="False">
             <i:Interaction.Behaviors>
                 <controls:BindableSelectedItemBehavior SelectedItem="{Binding SelectedItem, Mode=TwoWay}" />
             </i:Interaction.Behaviors>

RetailCoder.VBE/UI/Command/AddTestModuleCommand.cs

@@ -32,7 +32,8 @@ public override bool CanExecute(object parameter)
             }
 
             // Outlook requires test methods to be located in [ThisOutlookSession] class.
-            return app.ApplicationName != "Outlook";
+            //return app.ApplicationName != "Outlook";
+            return true;
         }
 
         public override void Execute(object parameter)

Rubberduck.Parsing/Symbols/ReferencedDeclarationsCollector.cs

@@ -144,7 +144,7 @@ private string GetTypeName(ITypeInfo info)
             string helpFile;
             info.GetDocumentation(-1, out typeName, out docString, out helpContext, out helpFile);
 
-            return typeName;
+            return typeName.Equals("LONG_PTR") ? "LongPtr" : typeName;  //Quickfix for http://chat.stackexchange.com/transcript/message/30119269#30119269
         }
 
         public List<Declaration> GetDeclarationsForReference(Reference reference)
@@ -350,6 +350,12 @@ private Declaration CreateMemberDeclaration(FUNCDESC memberDescriptor, TYPEKIND
             var funcValueType = (VarEnum)memberDescriptor.elemdescFunc.tdesc.vt;
             var memberDeclarationType = GetDeclarationType(memberName, memberDescriptor, funcValueType, typeKind, parentImplFlags);
 
+            if (((FUNCFLAGS)memberDescriptor.wFuncFlags).HasFlag(FUNCFLAGS.FUNCFLAG_FRESTRICTED) &&
+                IgnoredInterfaceMembers.Contains(memberName)) // Ignore IDispatch and IUnknown members - quick-and-dirty for beta
+            {
+                return null;
+            }
+
             var asTypeName = new ComParameter(string.Empty, false);
             if (memberDeclarationType != DeclarationType.Procedure)
             {
@@ -587,8 +593,7 @@ private DeclarationType GetDeclarationType(string memberName, FUNCDESC funcDesc,
                 memberType = DeclarationType.PropertySet;
             }
             else if ((parentImplTypeFlags.HasFlag(IMPLTYPEFLAGS.IMPLTYPEFLAG_FSOURCE) ||
-                ((FUNCFLAGS)funcDesc.wFuncFlags).HasFlag(FUNCFLAGS.FUNCFLAG_FSOURCE)) &&
-                !IgnoredInterfaceMembers.Contains(memberName))  // quick-and-dirty for beta
+                ((FUNCFLAGS)funcDesc.wFuncFlags).HasFlag(FUNCFLAGS.FUNCFLAG_FSOURCE)))
             {
                 memberType = DeclarationType.Event;
             }

Rubberduck.VBEEditor/Extensions/VbeExtensions.cs

@@ -66,6 +66,8 @@ public static IHostApplication HostApplication(this VBE vbe)
                             return new PowerPointApp();
                         case "Microsoft Outlook":
                             return new OutlookApp();
+                        case "Microsoft Project":
+                            return new ProjectApp();
                         case "Microsoft Publisher":
                             return new PublisherApp();
                         case "Microsoft Visio":
@@ -94,6 +96,8 @@ public static IHostApplication HostApplication(this VBE vbe)
                         return new PowerPointApp();
                     case "Outlook":
                         return new OutlookApp();
+                    case "MSProject":
+                        return new ProjectApp();
                     case "Publisher":
                         return new PublisherApp();
                     case "Visio":

Rubberduck.VBEEditor/Rubberduck.VBEditor.csproj

@@ -42,6 +42,11 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
       <HintPath>..\libs\Microsoft.Office.Interop.Excel.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Office.Interop.MSProject, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\libs\Microsoft.Office.Interop.MSProject.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Office.Interop.Outlook, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>True</EmbedInteropTypes>
@@ -114,6 +119,7 @@
     </Compile>
     <Compile Include="VBEHost\AccessApp.cs" />
     <Compile Include="VBEHost\CorelDRAWApp.cs" />
+    <Compile Include="VBEHost\ProjectApp.cs" />
     <Compile Include="VBEHost\ExcelApp.cs" />
     <Compile Include="VBEHost\FallbackApp.cs" />
     <Compile Include="VBEHost\HostApplicationBase.cs" />

Rubberduck.VBEEditor/VBEHost/OutlookApp.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
-//using Microsoft.Office.Interop.Outlook;
+using Microsoft.Office.Core;
+using Microsoft.Office.Interop.Outlook;
 
 namespace Rubberduck.VBEditor.VBEHost
 {
@@ -23,7 +24,18 @@ public override void Run(QualifiedMemberName qualifiedMemberName)
             //taskitem.Subject = "Rubberduck";
             //taskitem.Body = qualifiedMemberName.MemberName;
 
-            throw new NotImplementedException();
+            try
+            {
+                var app = Application;
+                var exp = app.ActiveExplorer();
+                CommandBar cb = exp.CommandBars.Add("RubberduckCallbackProxy", Temporary: true);
+                CommandBarControl btn = cb.Controls.Add(MsoControlType.msoControlButton, 1);
+                btn.OnAction = qualifiedMemberName.ToString();
+                btn.Execute();
+                cb.Delete();
+            }
+            catch {             
+            }
         }
     }
 }

Rubberduck.VBEEditor/VBEHost/ProjectApp.cs

@@ -0,0 +1,22 @@
+using Microsoft.Vbe.Interop;
+
+namespace Rubberduck.VBEditor.VBEHost
+{
+    public class ProjectApp : HostApplicationBase<Microsoft.Office.Interop.MSProject.Application>
+    {
+        public ProjectApp() : base("MSProject") { }
+        public ProjectApp(VBE vbe) : base(vbe, "MSProject") { }
+
+        public override void Run(QualifiedMemberName qualifiedMemberName)
+        {
+            var call = GenerateMethodCall(qualifiedMemberName);
+            Application.Macro(call);
+        }
+
+        protected virtual string GenerateMethodCall(QualifiedMemberName qualifiedMemberName)
+        {
+            var moduleName = qualifiedMemberName.QualifiedModuleName.Component.Name;
+            return string.Concat(moduleName, ".", qualifiedMemberName.MemberName);
+        }
+    }
+}