fix redim statement / type hints / wrong call statement tree (#1592)

Author: Andrin Meier

RetailCoder.VBE/Inspections/ConvertToProcedureQuickFix.cs

@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using Microsoft.Vbe.Interop;
+using Rubberduck.Parsing.Symbols;
 
 namespace Rubberduck.Inspections
 {
@@ -55,13 +56,13 @@ public override void Fix()
                 : Tokens.Property;
 
             string visibility = context.visibility() == null ? string.Empty : context.visibility().GetText() + ' ';
-            string name = ' ' + functionName.identifier().identifierValue().GetText();
-            bool hasTypeHint = functionName.identifier().typeHint() != null;
+            string name = ' ' + Identifier.GetName(functionName.identifier());
+            bool hasTypeHint = Identifier.GetTypeHintValue(functionName.identifier()) != null;
 
             string args = context.argList().GetText();
             string asType = context.asTypeClause() == null ? string.Empty : ' ' + context.asTypeClause().GetText();
 
-            string oldSignature = visibility + token + name + (hasTypeHint ? functionName.identifier().typeHint().GetText() : string.Empty) + args + asType;
+            string oldSignature = visibility + token + name + (hasTypeHint ? Identifier.GetTypeHintValue(functionName.identifier()) : string.Empty) + args + asType;
             string newSignature = visibility + Tokens.Sub + name + args;
 
             string procedure = Context.GetText();

RetailCoder.VBE/Inspections/ObsoleteTypeHintInspectionResult.cs

@@ -7,6 +7,7 @@
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.VBEditor;
+using Rubberduck.Parsing.Symbols;
 
 namespace Rubberduck.Inspections
 {
@@ -74,7 +75,7 @@ private void FixTypeHintUsage(string hint, CodeModule module, Selection selectio
 
             if (isDeclaration && Context is VBAParser.FunctionStmtContext)
             {
-                var typeHint = ((VBAParser.FunctionStmtContext)Context).functionName().identifier().typeHint();
+                var typeHint = Identifier.GetTypeHintContext(((VBAParser.FunctionStmtContext)Context).functionName().identifier());
                 var argList = ((VBAParser.FunctionStmtContext)Context).argList();
                 var endLine = argList.Stop.Line;
                 var endColumn = argList.Stop.Column;
@@ -86,7 +87,7 @@ private void FixTypeHintUsage(string hint, CodeModule module, Selection selectio
             }
             else if (isDeclaration && Context is VBAParser.PropertyGetStmtContext)
             {
-                var typeHint = ((VBAParser.PropertyGetStmtContext)Context).functionName().identifier().typeHint();
+                var typeHint = Identifier.GetTypeHintContext(((VBAParser.PropertyGetStmtContext)Context).functionName().identifier());
                 var argList = ((VBAParser.PropertyGetStmtContext)Context).argList();
                 var endLine = argList.Stop.Line;
                 var endColumn = argList.Stop.Column;

RetailCoder.VBE/Inspections/ProcedureShouldBeFunctionInspectionResult.cs

@@ -6,6 +6,7 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.VBEditor;
+using Rubberduck.Parsing.Symbols;
 
 namespace Rubberduck.Inspections
 {
@@ -115,7 +116,7 @@ private void UpdateSignature()
 
         private void UpdateCalls()
         {
-            var procedureName = _subStmtQualifiedContext.Context.subroutineName().identifier().identifierValue().GetText();
+            var procedureName = Identifier.GetName(_subStmtQualifiedContext.Context.subroutineName().identifier());
 
             var procedure =
                 _state.AllDeclarations.SingleOrDefault(d =>

Rubberduck.Parsing/Binding/ArgumentList.cs

@@ -1,6 +1,4 @@
-using Rubberduck.Parsing.Symbols;
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace Rubberduck.Parsing.Binding

Rubberduck.Parsing/Binding/DefaultBindingContext.cs

@@ -116,7 +116,7 @@ private IExpressionBinding VisitType(Declaration module, Declaration parent, Par
 
         private IExpressionBinding Visit(Declaration module, Declaration parent, VBAParser.SimpleNameExprContext expression, IBoundExpression withBlockVariable, StatementResolutionContext statementContext)
         {
-            return new SimpleNameDefaultBinding(_declarationFinder, Declaration.GetProjectParent(parent), module, parent, expression, statementContext);
+            return new SimpleNameDefaultBinding(_declarationFinder, Declaration.GetProjectParent(parent), module, parent, expression, Identifier.GetName(expression.identifier()), statementContext);
         }
 
         private IExpressionBinding Visit(Declaration module, Declaration parent, VBAParser.MemberAccessExprContext expression, IBoundExpression withBlockVariable, StatementResolutionContext statementContext)

Rubberduck.Parsing/Binding/MemberAccessDefaultBinding.cs

@@ -33,7 +33,7 @@ public MemberAccessDefaultBinding(
                   parent,
                   expression,
                   null,
-                  ExpressionName.GetName(expression.unrestrictedIdentifier()),
+                  Identifier.GetName(expression.unrestrictedIdentifier()),
                   statementContext,
                   unrestrictedNameContext)
         {

Rubberduck.Parsing/Binding/MemberAccessProcedurePointerBinding.cs

@@ -40,7 +40,7 @@ public IBoundExpression Resolve()
             {
                 return lExpression;
             }
-            string name = ExpressionName.GetName(_expression.unrestrictedIdentifier());
+            string name = Identifier.GetName(_expression.unrestrictedIdentifier());
             if (lExpression.Classification != ExpressionClassification.ProceduralModule)
             {
                 return null;

Rubberduck.Parsing/Binding/MemberAccessTypeBinding.cs

@@ -48,7 +48,7 @@ public IBoundExpression Resolve()
             {
                 return lExpression;
             }
-            string unrestrictedName = ExpressionName.GetName(_expression.unrestrictedIdentifier());
+            string unrestrictedName = Identifier.GetName(_expression.unrestrictedIdentifier());
             boundExpression = ResolveLExpressionIsProject(lExpression, unrestrictedName);
             if (boundExpression != null)
             {