Merge pull request #905 from Hosch250/BugBlipper

Display type in UI for extract interface

Author: retailcoder

RetailCoder.VBE/Refactorings/ExtractInterface/InterfaceMember.cs

@@ -25,14 +25,13 @@ public class InterfaceMember
         public string Type { get; set; }
 
         public string MemberType { get; set; }
-        public string PropertyType { get; set; }
 
         public bool IsSelected { get; set; }
         public string MemberSignature
         {
             get
             {
-                var signature = Member.IdentifierName + "(" +
+                var signature = MemberType + " " + Member.IdentifierName + "(" +
                     string.Join(", ", MemberParams.Select(m => m.ParamType)) + ")";
 
                 return Type == null ? signature : signature + " As " + Type;
@@ -43,7 +42,7 @@ public string FullMemberSignature
         {
             get
             {
-                var signature = Member.IdentifierName + "(" +
+                var signature = MemberType + " " + Member.IdentifierName + "(" +
                     string.Join(", ", MemberParams) + ")";
 
                 return Type == null ? signature : signature + " As " + Type;
@@ -69,12 +68,11 @@ public InterfaceMember(Declaration member, IEnumerable<Declaration> declarations
                                        })
                                        .ToList();
 
-            if (PropertyType == "Get")
+            if (MemberType == "Property Get")
             {
                 MemberParams = MemberParams.Take(MemberParams.Count() - 1);
             }
 
-
             IsSelected = false;
         }
 
@@ -97,29 +95,26 @@ private void GetMethodType()
             var propertyGetStmtContext = context as VBAParser.PropertyGetStmtContext;
             if (propertyGetStmtContext != null)
             {
-                MemberType = Tokens.Property;
-                PropertyType = Tokens.Get;
+                MemberType = Tokens.Property + " " + Tokens.Get;
             }
 
             var propertyLetStmtContext = context as VBAParser.PropertyLetStmtContext;
             if (propertyLetStmtContext != null)
             {
-                MemberType = Tokens.Property;
-                PropertyType = Tokens.Let;
+                MemberType = Tokens.Property + " " + Tokens.Let;
             }
 
             var propertySetStmtContext = context as VBAParser.PropertySetStmtContext;
             if (propertySetStmtContext != null)
             {
-                MemberType = Tokens.Property;
-                PropertyType = Tokens.Set;
+                MemberType = Tokens.Property + " " + Tokens.Set;
             }
         }
 
         public override string ToString()
         {
-            return "Public " + MemberType + " " + PropertyType + " " + FullMemberSignature + Environment.NewLine + "End " + MemberType +
-                   Environment.NewLine;
+            return "Public " + FullMemberSignature + Environment.NewLine + 
+                "End " + MemberType.Split(' ').First() + Environment.NewLine;
         }
     }
 }