Merge pull request #1 from retailcoder/next

some more fixes from retailcoder

Author: MDoerner

RetailCoder.VBE/UI/Command/MenuItems/CommandBars/IContextFormatter.cs

@@ -45,11 +45,15 @@ private string Format(Declaration declaration)
 
             typeName = "(" + declarationType + (string.IsNullOrEmpty(typeName) ? string.Empty : ":" + typeName) + ")";
 
-            if (declaration.DeclarationType.HasFlag(DeclarationType.Module))
+            if (declaration.DeclarationType.HasFlag(DeclarationType.Project))
+            {
+                formattedDeclaration = System.IO.Path.GetFileName(declaration.QualifiedName.QualifiedModuleName.ProjectPath) + ";" + declaration.IdentifierName;
+            }
+            else if (declaration.DeclarationType.HasFlag(DeclarationType.Module))
             {
                 formattedDeclaration = moduleName.ToString();
             }
-
+            
             if (declaration.DeclarationType.HasFlag(DeclarationType.Member))
             {
                 formattedDeclaration = declaration.QualifiedName.ToString();
@@ -59,7 +63,7 @@ private string Format(Declaration declaration)
                     formattedDeclaration += typeName;
                 }
             }
-
+            
             if (declaration.DeclarationType == DeclarationType.Enumeration
                 || declaration.DeclarationType == DeclarationType.UserDefinedType)
             {
@@ -68,8 +72,7 @@ private string Format(Declaration declaration)
                     ? System.IO.Path.GetFileName(moduleName.ProjectPath) + ";" + moduleName.ProjectName + "." + declaration.IdentifierName
                     : moduleName.ToString();
             }
-
-            if (declaration.DeclarationType == DeclarationType.EnumerationMember
+            else if (declaration.DeclarationType == DeclarationType.EnumerationMember
                 || declaration.DeclarationType == DeclarationType.UserDefinedTypeMember)
             {
                 formattedDeclaration = string.Format("{0}.{1}.{2}",
@@ -81,13 +84,13 @@ private string Format(Declaration declaration)
             }
 
             var subscripts = declaration.IsArray ? "()" : string.Empty;
-            if (declaration.ParentDeclaration.DeclarationType.HasFlag(DeclarationType.Member))
+            if (declaration.ParentDeclaration != null && declaration.ParentDeclaration.DeclarationType.HasFlag(DeclarationType.Member))
             {
                 // locals, parameters
                 formattedDeclaration = string.Format("{0}:{1}{2} {3}", declaration.ParentDeclaration.QualifiedName, declaration.IdentifierName, subscripts, typeName);
             }
 
-            if (declaration.ParentDeclaration.DeclarationType.HasFlag(DeclarationType.Module))
+            if (declaration.ParentDeclaration != null && declaration.ParentDeclaration.DeclarationType.HasFlag(DeclarationType.Module))
             {
                 // fields
                 var withEvents = declaration.IsWithEvents ? "(WithEvents) " : string.Empty;

Rubberduck.Parsing/Symbols/AliasDeclarations.cs

@@ -14,6 +14,7 @@ public class AliasDeclarations : ICustomDeclarationLoader
         private Declaration _fileSystemModule;
         private Declaration _interactionModule;
         private Declaration _stringsModule;
+        private Declaration _dateTimeModule;
 
         public AliasDeclarations(RubberduckParserState state)
         {
@@ -48,7 +49,9 @@ public IReadOnlyList<Declaration> Load()
             Grammar.Tokens.RightB,
             Grammar.Tokens.RTrim,
             Grammar.Tokens.String,
-            Grammar.Tokens.UCase
+            Grammar.Tokens.UCase,
+            Grammar.Tokens.Date,
+            Grammar.Tokens.Time,
         };
 
         private IReadOnlyList<Declaration> AddAliasDeclarations()
@@ -71,7 +74,7 @@ private IReadOnlyList<Declaration> AddAliasDeclarations()
             var functionAliases = FunctionAliasesWithoutParameters();
             AddParametersToAliasesFromReferencedFunctions(functionAliases, possiblyAliasedFunctions);
 
-            return functionAliases;
+            return functionAliases.Concat<Declaration>(PropertyGetDeclarations()).ToList();
         }
 
         private void UpdateAliasFunctionModulesFromReferencedProjects(DeclarationFinder finder)
@@ -88,6 +91,7 @@ private void UpdateAliasFunctionModulesFromReferencedProjects(DeclarationFinder
             _fileSystemModule = finder.FindStdModule("FileSystem", vba, true);
             _interactionModule = finder.FindStdModule("Interaction", vba, true);
             _stringsModule = finder.FindStdModule("Strings", vba, true);
+            _dateTimeModule = finder.FindStdModule("DateTime", vba, true);
         }
 
 
@@ -120,6 +124,50 @@ private List<Declaration> ReferencedBuiltInFunctionsThatMightHaveAnAlias(Rubberd
             return functions.ToList();
         }
 
+        private List<PropertyGetDeclaration> PropertyGetDeclarations()
+        {
+            return new List<PropertyGetDeclaration>
+            {
+                DatePropertyGet(),
+                TimePropertyGet(),
+            };
+        }
+
+        private PropertyGetDeclaration DatePropertyGet()
+        {
+            return new PropertyGetDeclaration(
+                new QualifiedMemberName(_dateTimeModule.QualifiedName.QualifiedModuleName, "Date"),
+                _dateTimeModule,
+                _dateTimeModule,
+                "Variant",
+                null,
+                string.Empty,
+                Accessibility.Global,
+                null,
+                new Selection(),
+                false,
+                true,
+                new List<IAnnotation>(),
+                new Attributes());
+        }
+
+        private PropertyGetDeclaration TimePropertyGet()
+        {
+            return new PropertyGetDeclaration(
+                new QualifiedMemberName(_dateTimeModule.QualifiedName.QualifiedModuleName, "Time"),
+                _dateTimeModule,
+                _dateTimeModule,
+                "Variant",
+                null,
+                string.Empty,
+                Accessibility.Global,
+                null,
+                new Selection(),
+                false,
+                true,
+                new List<IAnnotation>(),
+                new Attributes());
+        }
 
         private List<FunctionDeclaration> FunctionAliasesWithoutParameters()
         {
@@ -146,7 +194,7 @@ private List<FunctionDeclaration> FunctionAliasesWithoutParameters()
                 RightBFunction(),
                 RTrimFunction(),
                 StringFunction(),
-                UCaseFunction()
+                UCaseFunction(),
             };
         }