Give precedence to type hinted identifiers in grammar. Closes #2618

Author: comintern

Rubberduck.Parsing/Grammar/VBALexer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Users\hosch\Documents\Visual Studio 2015\Projects\Rubberduck\Rubberduck.Parsing\Grammar\VBALexer.g4 by ANTLR 4.3
+// Generated from C:\Dev\Rubberduck\Rubberduck.Parsing\Grammar\VBALexer.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162

Rubberduck.Parsing/Grammar/VBAParser.cs

@@ -13450,14 +13450,14 @@ public IdentifierContext identifier() {
 			case 1:
 				EnterOuterAlt(_localctx, 1);
 				{
-				State = 2184; untypedIdentifier();
+				State = 2184; typedIdentifier();
 				}
 				break;
 
 			case 2:
 				EnterOuterAlt(_localctx, 2);
 				{
-				State = 2185; typedIdentifier();
+				State = 2185; untypedIdentifier();
 				}
 				break;
 			}
@@ -20544,7 +20544,7 @@ private bool upperCaseA_sempred(UpperCaseAContext _localctx, int predIndex) {
 		"\x2\x2\x2\x883\x884\x5\x172\xBA\x2\x884\x14B\x3\x2\x2\x2\x885\x889\x5"+
 		"\x14E\xA8\x2\x886\x889\x5\x19C\xCF\x2\x887\x889\x5\x19A\xCE\x2\x888\x885"+
 		"\x3\x2\x2\x2\x888\x886\x3\x2\x2\x2\x888\x887\x3\x2\x2\x2\x889\x14D\x3"+
-		"\x2\x2\x2\x88A\x88D\x5\x150\xA9\x2\x88B\x88D\x5\x152\xAA\x2\x88C\x88A"+
+		"\x2\x2\x2\x88A\x88D\x5\x152\xAA\x2\x88B\x88D\x5\x150\xA9\x2\x88C\x88A"+
 		"\x3\x2\x2\x2\x88C\x88B\x3\x2\x2\x2\x88D\x14F\x3\x2\x2\x2\x88E\x88F\x5"+
 		"\x154\xAB\x2\x88F\x151\x3\x2\x2\x2\x890\x891\x5\x154\xAB\x2\x891\x892"+
 		"\x5\x16E\xB8\x2\x892\x153\x3\x2\x2\x2\x893\x898\a\xED\x2\x2\x894\x898"+

Rubberduck.Parsing/Grammar/VBAParser.g4

@@ -522,7 +522,7 @@ subscripts : subscript (whiteSpace? COMMA whiteSpace? subscript)*;
 subscript : (expression whiteSpace TO whiteSpace)? expression;
 
 unrestrictedIdentifier : identifier | statementKeyword | markerKeyword;
-identifier : untypedIdentifier | typedIdentifier;
+identifier : typedIdentifier | untypedIdentifier;
 untypedIdentifier : identifierValue;
 typedIdentifier : identifierValue typeHint;
 identifierValue : IDENTIFIER | keyword | foreignName | BF;

Rubberduck.Parsing/Rubberduck.Parsing.csproj

@@ -42,7 +42,8 @@
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Antlr4.Runtime.net45">
+    <Reference Include="Antlr4.Runtime.net45, Version=4.3.0.0, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Antlr4.Runtime.4.3.0\lib\net45\Antlr4.Runtime.net45.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Build.Tasks.v4.0" />