Allow BF to be used as an identifier.

Author: comintern

Rubberduck.Parsing/Grammar/VBAParser.cs

@@ -525,7 +525,7 @@ unrestrictedIdentifier : identifier | statementKeyword | markerKeyword;
 identifier : untypedIdentifier | typedIdentifier;
 untypedIdentifier : identifierValue;
 typedIdentifier : identifierValue typeHint;
-identifierValue : IDENTIFIER | keyword | foreignName;
+identifierValue : IDENTIFIER | keyword | foreignName | BF;
 foreignName : L_SQUARE_BRACKET foreignIdentifier* R_SQUARE_BRACKET;
 foreignIdentifier : ~(L_SQUARE_BRACKET | R_SQUARE_BRACKET) | foreignName;
 

Rubberduck.Parsing/Grammar/VBAParser.g4

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Work\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
+// Generated from C:\Dev\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162

Rubberduck.Parsing/Grammar/VBAParserBaseListener.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Work\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
+// Generated from C:\Dev\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162

Rubberduck.Parsing/Grammar/VBAParserBaseVisitor.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Work\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
+// Generated from C:\Dev\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162

Rubberduck.Parsing/Grammar/VBAParserListener.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Work\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
+// Generated from C:\Dev\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162

Rubberduck.Parsing/Grammar/VBAParserVisitor.cs

@@ -305,11 +305,11 @@
     <Compile Include="VBA\VBAModuleParser.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Antlr4 Include="Grammar\VBAParser.g4">
+    <None Include="Grammar\VBAParser.g4">
       <Generator>MSBuild:Compile</Generator>
       <CustomToolNamespace>Rubberduck.Parsing.Grammar</CustomToolNamespace>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Antlr4>
+    </None>
     <None Include="packages.config" />
     <None Include="Grammar\VBALexer.g4">
       <Generator>MSBuild:Compile</Generator>

Rubberduck.Parsing/Rubberduck.Parsing.csproj

@@ -2422,5 +2422,67 @@ End Sub
 
             Assert.IsTrue(declaration.References.ElementAt(0).IsAssignment);
         }
+
+        //https://github.com/rubberduck-vba/Rubberduck/issues/2478
+        [TestMethod]
+        public void VariableNamedBfResolvesAsAVariable()
+        {
+            // arrange
+            var code = @"
+Public Sub Test()
+    Dim bf As Integer
+    Debug.Print bf
+End Sub
+";
+            // act
+            var state = Resolve(code);
+
+            // assert
+            var declaration = state.AllUserDeclarations.SingleOrDefault(item =>
+                item.DeclarationType == DeclarationType.Variable && item.IdentifierName == "bf");
+
+            Assert.IsNotNull(declaration);
+        }
+
+        //https://github.com/rubberduck-vba/Rubberduck/issues/2478
+        [TestMethod]
+        public void ProcedureNamedBfResolvesAsAProcedure()
+        {
+            // arrange
+            var code = @"
+Public Sub Bf()
+    Debug.Print ""I'm cool with that""
+End Sub
+";
+            // act
+            var state = Resolve(code);
+
+            // assert
+            var declaration = state.AllUserDeclarations.SingleOrDefault(item =>
+                item.DeclarationType == DeclarationType.Procedure && item.IdentifierName == "Bf");
+
+            Assert.IsNotNull(declaration);
+        }
+
+        //https://github.com/rubberduck-vba/Rubberduck/issues/2478
+        [TestMethod]
+        public void TypeNamedBfResolvesAsAType()
+        {
+            // arrange
+            var code = @"
+Private Type Bf
+    b As Long
+    f As Long
+End Type
+";
+            // act
+            var state = Resolve(code);
+
+            // assert
+            var declaration = state.AllUserDeclarations.SingleOrDefault(item =>
+                item.DeclarationType == DeclarationType.UserDefinedType && item.IdentifierName == "Bf");
+
+            Assert.IsNotNull(declaration);
+        }
     }
 }