clean up file statements + consider inherited members as belonging to enclosed module + special forms (#1499)

* clean up file statements (fixes #1487)

* consider members in supertypes as members of enclosing module (fixes #1489)

* remove temp fix (should be fixed with #1489)

* add support for Circle and Scale special forms (fixes #1498)

Author: Andrin Meier

Rubberduck.Parsing/Binding/DefaultBindingContext.cs

@@ -38,7 +38,9 @@ public IExpressionBinding BuildTree(Declaration module, Declaration parent, Pars
 
         private IExpressionBinding Visit(Declaration module, Declaration parent, VBAExpressionParser.StartRuleContext expression, IBoundExpression withBlockVariable, ResolutionStatementContext statementContext)
         {
-            // Call statements always have an argument list
+            // Call statements always have an argument list.
+            // One of the reasons we're doing this is that an empty argument list could represent a call to a default member,
+            // which requires us to use an IndexDefaultBinding.
             if (statementContext == ResolutionStatementContext.CallStatement)
             {
                 if (expression.callStmt() != null)
@@ -115,6 +117,14 @@ private IExpressionBinding Visit(Declaration module, Declaration parent, VBAExpr
             return Visit(module, parent, expression.newExpression(), withBlockVariable, ResolutionStatementContext.Undefined);
         }
 
+        private IExpressionBinding Visit(Declaration module, Declaration parent, VBAExpressionParser.MarkedFileNumberExprContext expression, IBoundExpression withBlockVariable, ResolutionStatementContext statementContext)
+        {
+            // The MarkedFileNumberExpr doesn't actually exist but for backwards compatibility reasons we support it, ignore the "hash tag" of the file number
+            // and resolve it as a normal expression.
+            // This allows us to support functions such as Input(file1, #file1) which would otherwise not work.
+            return Visit(module, parent, (dynamic)expression.expression(), withBlockVariable, ResolutionStatementContext.Undefined);
+        }
+
         private IExpressionBinding Visit(Declaration module, Declaration parent, VBAExpressionParser.NewExpressionContext expression, IBoundExpression withBlockVariable, ResolutionStatementContext statementContext)
         {
             var typeExpressionBinding = Visit(module, parent, expression.typeExpression(), withBlockVariable, ResolutionStatementContext.Undefined);

Rubberduck.Parsing/Binding/IndexDefaultBinding.cs

@@ -269,8 +269,7 @@ and declared type.
              */
             if (lExpression.Classification == ExpressionClassification.Property
                || lExpression.Classification == ExpressionClassification.Function
-               || lExpression.Classification == ExpressionClassification.Subroutine
-               || lExpression.Classification == ExpressionClassification.Type)
+               || lExpression.Classification == ExpressionClassification.Subroutine)
             {
                 return new IndexExpression(lExpression.ReferencedDeclaration, lExpression.Classification, _expression, lExpression, _argumentList);
             }

Rubberduck.Parsing/Binding/MemberAccessDefaultBinding.cs

@@ -349,7 +349,7 @@ private IBoundExpression ResolveMemberInReferencedProject(bool lExpressionIsEncl
         {
             if (lExpressionIsEnclosingProject)
             {
-                var foundType = _declarationFinder.FindMemberEnclosingModule(_project, _module, _parent, _name, memberType);
+                var foundType = _declarationFinder.FindMemberEnclosingModule(_module, _parent, _name, memberType);
                 if (foundType != null)
                 {
                     return new MemberAccessExpression(foundType, classification, _context, _unrestrictedNameContext,  _lExpression);

Rubberduck.Parsing/Binding/MemberAccessTypeBinding.cs

@@ -219,7 +219,7 @@ refers to the specified UDT or enum.
              */
             if (lExpressionIsEnclosingProject)
             {
-                var foundType = _declarationFinder.FindMemberEnclosingModule(_project, _module, _parent, name, memberType);
+                var foundType = _declarationFinder.FindMemberEnclosingModule(_module, _parent, name, memberType);
                 if (foundType != null)
                 {
                     return new MemberAccessExpression(foundType, ExpressionClassification.Type, GetExpressionContext(), _unrestrictedNameContext, lExpression);

Rubberduck.Parsing/Binding/SimpleNameDefaultBinding.cs

@@ -101,37 +101,37 @@ private IBoundExpression ResolveEnclosingModuleNamespace(string name)
                 Enclosing Module namespace: A variable, constant, Enum type, Enum member, property, 
                 function or subroutine defined at the module-level in the enclosing module.
             */
-            var moduleVariable = _declarationFinder.FindMemberEnclosingModule(_project, _module, _parent, name, DeclarationType.Variable);
+            var moduleVariable = _declarationFinder.FindMemberEnclosingModule(_module, _parent, name, DeclarationType.Variable);
             if (IsValidMatch(moduleVariable, name))
             {
                 return new SimpleNameExpression(moduleVariable, ExpressionClassification.Variable, _expression);
             }
-            var moduleConstant = _declarationFinder.FindMemberEnclosingModule(_project, _module, _parent, name, DeclarationType.Constant);
+            var moduleConstant = _declarationFinder.FindMemberEnclosingModule(_module, _parent, name, DeclarationType.Constant);
             if (IsValidMatch(moduleConstant, name))
             {
                 return new SimpleNameExpression(moduleConstant, ExpressionClassification.Variable, _expression);
             }
-            var enumType = _declarationFinder.FindMemberEnclosingModule(_project, _module, _parent, name, DeclarationType.Enumeration);
+            var enumType = _declarationFinder.FindMemberEnclosingModule(_module, _parent, name, DeclarationType.Enumeration);
             if (IsValidMatch(enumType, name))
             {
                 return new SimpleNameExpression(enumType, ExpressionClassification.Type, _expression);
             }
-            var enumMember = _declarationFinder.FindMemberEnclosingModule(_project, _module, _parent, name, DeclarationType.EnumerationMember);
+            var enumMember = _declarationFinder.FindMemberEnclosingModule(_module, _parent, name, DeclarationType.EnumerationMember);
             if (IsValidMatch(enumMember, name))
             {
                 return new SimpleNameExpression(enumMember, ExpressionClassification.Value, _expression);
             }
-            var property = _declarationFinder.FindMemberEnclosingModule(_project, _module, _parent, name, _propertySearchType);
+            var property = _declarationFinder.FindMemberEnclosingModule(_module, _parent, name, _propertySearchType);
             if (IsValidMatch(property, name))
             {
                 return new SimpleNameExpression(property, ExpressionClassification.Property, _expression);
             }
-            var function = _declarationFinder.FindMemberEnclosingModule(_project, _module, _parent, name, DeclarationType.Function);
+            var function = _declarationFinder.FindMemberEnclosingModule(_module, _parent, name, DeclarationType.Function);
             if (IsValidMatch(function, name))
             {
                 return new SimpleNameExpression(function, ExpressionClassification.Function, _expression);
             }
-            var subroutine = _declarationFinder.FindMemberEnclosingModule(_project, _module, _parent, name, DeclarationType.Procedure);
+            var subroutine = _declarationFinder.FindMemberEnclosingModule(_module, _parent, name, DeclarationType.Procedure);
             if (IsValidMatch(subroutine, name))
             {
                 return new SimpleNameExpression(subroutine, ExpressionClassification.Subroutine, _expression);

Rubberduck.Parsing/Binding/SimpleNameProcedurePointerBinding.cs

@@ -48,17 +48,17 @@ private IBoundExpression ResolveEnclosingModule(string name)
                 Enclosing Module namespace: A function, subroutine or property with a Property Get defined 
                 at the module-level in the enclosing module.
             */
-            var function = _declarationFinder.FindMemberEnclosingModule(_project, _module, _parent, name, DeclarationType.Function);
+            var function = _declarationFinder.FindMemberEnclosingModule(_module, _parent, name, DeclarationType.Function);
             if (function != null)
             {
                 return new SimpleNameExpression(function, ExpressionClassification.Function, _expression);
             }
-            var subroutine = _declarationFinder.FindMemberEnclosingModule(_project, _module, _parent, name, DeclarationType.Procedure);
+            var subroutine = _declarationFinder.FindMemberEnclosingModule(_module, _parent, name, DeclarationType.Procedure);
             if (subroutine != null)
             {
                 return new SimpleNameExpression(subroutine, ExpressionClassification.Subroutine, _expression);
             }
-            var propertyGet = _declarationFinder.FindMemberEnclosingModule(_project, _module, _parent, name, DeclarationType.PropertyGet);
+            var propertyGet = _declarationFinder.FindMemberEnclosingModule(_module, _parent, name, DeclarationType.PropertyGet);
             if (propertyGet != null)
             {
                 return new SimpleNameExpression(propertyGet, ExpressionClassification.Property, _expression);

Rubberduck.Parsing/Binding/SimpleNameTypeBinding.cs

@@ -97,12 +97,12 @@ private IBoundExpression ResolveEnclosingModule(string name)
                 Enclosing Module namespace: A UDT or Enum type defined at the module-level in the 
                 enclosing module.
             */
-            var udt = _declarationFinder.FindMemberEnclosingModule(_project, _module, _parent, name, DeclarationType.UserDefinedType);
+            var udt = _declarationFinder.FindMemberEnclosingModule(_module, _parent, name, DeclarationType.UserDefinedType);
             if (udt != null)
             {
                 return new SimpleNameExpression(udt, ExpressionClassification.Type, _expression);
             }
-            var enumType = _declarationFinder.FindMemberEnclosingModule(_project, _module, _parent, name, DeclarationType.Enumeration);
+            var enumType = _declarationFinder.FindMemberEnclosingModule(_module, _parent, name, DeclarationType.Enumeration);
             if (enumType != null)
             {
                 return new SimpleNameExpression(enumType, ExpressionClassification.Type, _expression);