Merge pull request #3470 from rubberduck-vba/next

v2.1.0 ...take 3

Author: retailcoder

Rubberduck.Parsing/Grammar/PartialExtensions/VBAParserPartialExtensions.cs

@@ -424,6 +424,78 @@ public void AddAttributes(Attributes attributes)
             #endregion
         }
 
+        public partial class UdtDeclarationContext : IIdentifierContext, IAnnotatedContext
+        {
+            #region IIdentifierContext
+            public Interval IdentifierTokens
+            {
+                get
+                {
+                    Interval tokenInterval;
+                    Identifier.GetName(this, out tokenInterval);
+                    return tokenInterval;
+                }
+            }
+            #endregion
+
+            #region IAnnotatedContext
+            public Attributes Attributes { get; } = new Attributes();
+            public int AttributeTokenIndex => Start.TokenIndex - 1;
+
+            private readonly List<AnnotationContext> _annotations = new List<AnnotationContext>();
+            public IEnumerable<AnnotationContext> Annotations => _annotations;
+
+            public void Annotate(AnnotationContext annotation)
+            {
+                _annotations.Add(annotation);
+            }
+
+            public void AddAttributes(Attributes attributes)
+            {
+                foreach (var attribute in attributes)
+                {
+                    Attributes.Add(new AttributeNode(attribute.Name, attribute.Values));
+                }
+            }
+            #endregion
+        }
+
+        public partial class UdtMemberContext : IIdentifierContext, IAnnotatedContext
+        {
+            #region IIdentifierContext
+            public Interval IdentifierTokens
+            {
+                get
+                {
+                    Interval tokenInterval;
+                    Identifier.GetName(this, out tokenInterval);
+                    return tokenInterval;
+                }
+            }
+            #endregion
+
+            #region IAnnotatedContext
+            public Attributes Attributes { get; } = new Attributes();
+            public int AttributeTokenIndex => Start.TokenIndex - 1;
+
+            private readonly List<AnnotationContext> _annotations = new List<AnnotationContext>();
+            public IEnumerable<AnnotationContext> Annotations => _annotations;
+
+            public void Annotate(AnnotationContext annotation)
+            {
+                _annotations.Add(annotation);
+            }
+
+            public void AddAttributes(Attributes attributes)
+            {
+                foreach (var attribute in attributes)
+                {
+                    Attributes.Add(new AttributeNode(attribute.Name, attribute.Values));
+                }
+            }
+            #endregion
+        }
+
         public partial class IdentifierStatementLabelContext : IIdentifierContext, IAnnotatedContext
         {
             #region IIdentifierContext

Rubberduck.Parsing/Symbols/Identifier.cs

@@ -120,6 +120,23 @@ public static string GetName(VBAParser.EnumerationStmtContext context)
             return GetName(context.identifier());
         }
 
+        public static string GetName(VBAParser.UdtDeclarationContext context, out Interval tokenInterval)
+        {
+            return GetName(context.untypedIdentifier(), out tokenInterval);
+        }
+
+        public static string GetName(VBAParser.UdtMemberContext context, out Interval tokenInterval)
+        {
+            var untypedIdentifier = context.untypedNameMemberDeclaration()?.untypedIdentifier();
+            if (untypedIdentifier != null)
+            {
+                return GetName(untypedIdentifier, out tokenInterval);
+            }
+
+            var unrestrictedIdentifier = context.reservedNameMemberDeclaration().unrestrictedIdentifier();
+            return GetName(unrestrictedIdentifier, out tokenInterval);
+        }
+
         public static string GetName(VBAParser.EnumerationStmt_ConstantContext context, out Interval tokenInterval)
         {
             var nameContext = context.identifier();