replace attributes grammar with vba grammar (#1250)

Author: Andrin Meier

Rubberduck.Parsing/Grammar/VBALexer.cs

@@ -34,16 +34,16 @@ module :
 	whiteSpace?
 ;
 
-moduleHeader : VERSION whiteSpace DOUBLELITERAL whiteSpace CLASS;
+moduleHeader : VERSION WS DOUBLELITERAL WS? CLASS? endOfStatement;
 
 moduleConfig :
-	BEGIN endOfStatement
+	BEGIN (WS GUIDLITERAL WS ambiguousIdentifier WS?)? endOfStatement
 	moduleConfigElement+
 	END
 ;
 
 moduleConfigElement :
-	ambiguousIdentifier whiteSpace? EQ whiteSpace? literal endOfStatement
+	ambiguousIdentifier WS* EQ WS* literal (COLON SHORTLITERAL)? endOfStatement
 ;
 
 moduleAttributes : (attributeStmt endOfStatement)+;

Rubberduck.Parsing/Grammar/VBALexer.g4

@@ -47,23 +47,23 @@ public const int
 		NEXT=110, GLOBAL=82, IDENTIFIER=218, WS=217, EMPTY=56, MOD=108, WITHEVENTS=180, 
 		COLON=2, STEP=159, TIME=166, OPTION_BASE=120, GT=188, PUT=135, WITH=179, 
 		LOCK_WRITE=102, LINE_CONTINUATION=219, TYPEOF=170, DEFVAR=48, RMDIR=146, 
-		DEFLNG=44, FALSE=76, ERRORCHAR=220, UNDERSCORE=216, INTEGERLITERAL=209, 
+		DEFLNG=44, FALSE=76, ERRORCHAR=221, UNDERSCORE=216, INTEGERLITERAL=209, 
 		END_IF=59, LOCK=94, TEXT=164, SINGLEQUOTE=215, SAVEPICTURE=148, MULT=193, 
 		SEMICOLON=3, BYTE=25, HEXLITERAL=207, ELSE=54, IF=85, TYPE=169, AMPERSAND=10, 
-		ENUM=66, DEFOBJ=45, IN=88, CHDRIVE=29, DOT=5, EXIT_DO=71, IS=90, EQV=67, 
-		WEND=176, FUNCTION=80, HASH=6, CASE=27, GEQ=187, GET=81, PUBLIC=134, ON_ERROR=116, 
-		END_ENUM=57, GOTO=84, INTDIV=185, WIDTH=178, BEGIN=19, EXIT_SUB=75, ASSIGN=183, 
-		COMMENT=214, WRITE=181, RANDOMIZE=137, DOUBLE=52, EXIT_PROPERTY=74, COMMA=1, 
-		RANDOM=136, PROPERTY_GET=130, SELECT=151, PRIVATE=129, ERASE=68, TAB=163, 
-		BYREF=24, VERSION=175, NEQ=194, END_TYPE=63, KILL=92, COLLECTION=32, NEW=111, 
-		INPUT=89, SINGLE=156, UNLOAD=171, ALIAS=13, SPC=157, LT=191, RESET=143, 
-		END_SUB=62, EVENT=70, READ_WRITE=140, OPTION_COMPARE=122, ME=105, NULL=114, 
-		NEWLINE=212, TRUE=168, RPAREN=197, APPACTIVATE=16, IMP=86, STRINGLITERAL=205, 
-		OCTLITERAL=206, READ=139, DATE=35, LIKE=99, AND=14, OPTION_PRIVATE_MODULE=123, 
-		SHORTLITERAL=208, PLUS=195, RESUME=144, SHARED=155, EXIT_FUNCTION=73, 
-		ACCESS=11, LINE_INPUT=100, ON=115, OR=124, PARAMARRAY=126, R_SQUARE_BRACKET=204, 
-		IMPLEMENTS=87, UNTIL=173, DEFCUR=42, DECLARE=36, DEFDATE=39, REDIM=141, 
-		LEQ=189, DEFSTR=47, LET=97, WHILE=177;
+		ENUM=66, DEFOBJ=45, IN=88, CHDRIVE=29, DOT=5, EXIT_DO=71, GUIDLITERAL=220, 
+		IS=90, EQV=67, WEND=176, FUNCTION=80, HASH=6, CASE=27, GEQ=187, GET=81, 
+		PUBLIC=134, ON_ERROR=116, END_ENUM=57, GOTO=84, INTDIV=185, WIDTH=178, 
+		BEGIN=19, EXIT_SUB=75, ASSIGN=183, COMMENT=214, WRITE=181, RANDOMIZE=137, 
+		DOUBLE=52, EXIT_PROPERTY=74, COMMA=1, RANDOM=136, PROPERTY_GET=130, SELECT=151, 
+		PRIVATE=129, ERASE=68, TAB=163, BYREF=24, VERSION=175, NEQ=194, END_TYPE=63, 
+		KILL=92, COLLECTION=32, NEW=111, INPUT=89, SINGLE=156, UNLOAD=171, ALIAS=13, 
+		SPC=157, LT=191, RESET=143, END_SUB=62, EVENT=70, READ_WRITE=140, OPTION_COMPARE=122, 
+		ME=105, NULL=114, NEWLINE=212, TRUE=168, RPAREN=197, APPACTIVATE=16, IMP=86, 
+		STRINGLITERAL=205, OCTLITERAL=206, READ=139, DATE=35, LIKE=99, AND=14, 
+		OPTION_PRIVATE_MODULE=123, SHORTLITERAL=208, PLUS=195, RESUME=144, SHARED=155, 
+		EXIT_FUNCTION=73, ACCESS=11, LINE_INPUT=100, ON=115, OR=124, PARAMARRAY=126, 
+		R_SQUARE_BRACKET=204, IMPLEMENTS=87, UNTIL=173, DEFCUR=42, DECLARE=36, 
+		DEFDATE=39, REDIM=141, LEQ=189, DEFSTR=47, LET=97, WHILE=177;
 	public static readonly string[] tokenNames = {
 		"<INVALID>", "','", "':'", "';'", "'!'", "'.'", "'#'", "'@'", "'%'", "'$'", 
 		"'&'", "ACCESS", "ADDRESSOF", "ALIAS", "AND", "ATTRIBUTE", "APPACTIVATE", 
@@ -94,7 +94,7 @@ public const int
 		"HASHIF", "HASHELSEIF", "HASHELSE", "HASHENDIF", "'['", "']'", "STRINGLITERAL", 
 		"OCTLITERAL", "HEXLITERAL", "SHORTLITERAL", "INTEGERLITERAL", "DOUBLELITERAL", 
 		"DATELITERAL", "NEWLINE", "REMCOMMENT", "COMMENT", "'''", "'_'", "WS", 
-		"IDENTIFIER", "LINE_CONTINUATION", "ERRORCHAR"
+		"IDENTIFIER", "LINE_CONTINUATION", "GUIDLITERAL", "ERRORCHAR"
 	};
 	public const int
 		RULE_compilationUnit = 0, RULE_ccBlock = 1, RULE_ccConst = 2, RULE_logicalLine = 3, 
@@ -219,7 +219,7 @@ public CcBlockContext ccBlock() {
 			State = 48;
 			_errHandler.Sync(this);
 			_la = _input.La(1);
-			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << COMMA) | (1L << COLON) | (1L << SEMICOLON) | (1L << EXCLAMATIONPOINT) | (1L << DOT) | (1L << HASH) | (1L << AT) | (1L << PERCENT) | (1L << DOLLAR) | (1L << AMPERSAND) | (1L << ACCESS) | (1L << ADDRESSOF) | (1L << ALIAS) | (1L << AND) | (1L << ATTRIBUTE) | (1L << APPACTIVATE) | (1L << APPEND) | (1L << AS) | (1L << BEGIN) | (1L << BEEP) | (1L << BINARY) | (1L << BOOLEAN) | (1L << BYVAL) | (1L << BYREF) | (1L << BYTE) | (1L << CALL) | (1L << CASE) | (1L << CHDIR) | (1L << CHDRIVE) | (1L << CLASS) | (1L << CLOSE) | (1L << COLLECTION) | (1L << CONST) | (1L << DATABASE) | (1L << DATE) | (1L << DECLARE) | (1L << DEFBOOL) | (1L << DEFBYTE) | (1L << DEFDATE) | (1L << DEFDBL) | (1L << DEFDEC) | (1L << DEFCUR) | (1L << DEFINT) | (1L << DEFLNG) | (1L << DEFOBJ) | (1L << DEFSNG) | (1L << DEFSTR) | (1L << DEFVAR) | (1L << DELETESETTING) | (1L << DIM) | (1L << DO) | (1L << DOUBLE) | (1L << EACH) | (1L << ELSE) | (1L << ELSEIF) | (1L << EMPTY) | (1L << END_ENUM) | (1L << END_FUNCTION) | (1L << END_IF) | (1L << END_PROPERTY) | (1L << END_SELECT) | (1L << END_SUB) | (1L << END_TYPE))) != 0) || ((((_la - 64)) & ~0x3f) == 0 && ((1L << (_la - 64)) & ((1L << (END_WITH - 64)) | (1L << (END - 64)) | (1L << (ENUM - 64)) | (1L << (EQV - 64)) | (1L << (ERASE - 64)) | (1L << (ERROR - 64)) | (1L << (EVENT - 64)) | (1L << (EXIT_DO - 64)) | (1L << (EXIT_FOR - 64)) | (1L << (EXIT_FUNCTION - 64)) | (1L << (EXIT_PROPERTY - 64)) | (1L << (EXIT_SUB - 64)) | (1L << (FALSE - 64)) | (1L << (FILECOPY - 64)) | (1L << (FRIEND - 64)) | (1L << (FOR - 64)) | (1L << (FUNCTION - 64)) | (1L << (GET - 64)) | (1L << (GLOBAL - 64)) | (1L << (GOSUB - 64)) | (1L << (GOTO - 64)) | (1L << (IF - 64)) | (1L << (IMP - 64)) | (1L << (IMPLEMENTS - 64)) | (1L << (IN - 64)) | (1L << (INPUT - 64)) | (1L << (IS - 64)) | (1L << (INTEGER - 64)) | (1L << (KILL - 64)) | (1L << (LOAD - 64)) | (1L << (LOCK - 64)) | (1L << (LONG - 64)) | (1L << (LOOP - 64)) | (1L << (LET - 64)) | (1L << (LIB - 64)) | (1L << (LIKE - 64)) | (1L << (LINE_INPUT - 64)) | (1L << (LOCK_READ - 64)) | (1L << (LOCK_WRITE - 64)) | (1L << (LOCK_READ_WRITE - 64)) | (1L << (LSET - 64)) | (1L << (ME - 64)) | (1L << (MID - 64)) | (1L << (MKDIR - 64)) | (1L << (MOD - 64)) | (1L << (NAME - 64)) | (1L << (NEXT - 64)) | (1L << (NEW - 64)) | (1L << (NOT - 64)) | (1L << (NOTHING - 64)) | (1L << (NULL - 64)) | (1L << (ON - 64)) | (1L << (ON_ERROR - 64)) | (1L << (ON_LOCAL_ERROR - 64)) | (1L << (OPEN - 64)) | (1L << (OPTIONAL - 64)) | (1L << (OPTION_BASE - 64)) | (1L << (OPTION_EXPLICIT - 64)) | (1L << (OPTION_COMPARE - 64)) | (1L << (OPTION_PRIVATE_MODULE - 64)) | (1L << (OR - 64)) | (1L << (OUTPUT - 64)) | (1L << (PARAMARRAY - 64)) | (1L << (PRESERVE - 64)))) != 0) || ((((_la - 128)) & ~0x3f) == 0 && ((1L << (_la - 128)) & ((1L << (PRINT - 128)) | (1L << (PRIVATE - 128)) | (1L << (PROPERTY_GET - 128)) | (1L << (PROPERTY_LET - 128)) | (1L << (PROPERTY_SET - 128)) | (1L << (PTRSAFE - 128)) | (1L << (PUBLIC - 128)) | (1L << (PUT - 128)) | (1L << (RANDOM - 128)) | (1L << (RANDOMIZE - 128)) | (1L << (RAISEEVENT - 128)) | (1L << (READ - 128)) | (1L << (READ_WRITE - 128)) | (1L << (REDIM - 128)) | (1L << (REM - 128)) | (1L << (RESET - 128)) | (1L << (RESUME - 128)) | (1L << (RETURN - 128)) | (1L << (RMDIR - 128)) | (1L << (RSET - 128)) | (1L << (SAVEPICTURE - 128)) | (1L << (SAVESETTING - 128)) | (1L << (SEEK - 128)) | (1L << (SELECT - 128)) | (1L << (SENDKEYS - 128)) | (1L << (SET - 128)) | (1L << (SETATTR - 128)) | (1L << (SHARED - 128)) | (1L << (SINGLE - 128)) | (1L << (SPC - 128)) | (1L << (STATIC - 128)) | (1L << (STEP - 128)) | (1L << (STOP - 128)) | (1L << (STRING - 128)) | (1L << (SUB - 128)) | (1L << (TAB - 128)) | (1L << (TEXT - 128)) | (1L << (THEN - 128)) | (1L << (TIME - 128)) | (1L << (TO - 128)) | (1L << (TRUE - 128)) | (1L << (TYPE - 128)) | (1L << (TYPEOF - 128)) | (1L << (UNLOAD - 128)) | (1L << (UNLOCK - 128)) | (1L << (UNTIL - 128)) | (1L << (VARIANT - 128)) | (1L << (VERSION - 128)) | (1L << (WEND - 128)) | (1L << (WHILE - 128)) | (1L << (WIDTH - 128)) | (1L << (WITH - 128)) | (1L << (WITHEVENTS - 128)) | (1L << (WRITE - 128)) | (1L << (XOR - 128)) | (1L << (ASSIGN - 128)) | (1L << (DIV - 128)) | (1L << (INTDIV - 128)) | (1L << (EQ - 128)) | (1L << (GEQ - 128)) | (1L << (GT - 128)) | (1L << (LEQ - 128)) | (1L << (LPAREN - 128)) | (1L << (LT - 128)))) != 0) || ((((_la - 192)) & ~0x3f) == 0 && ((1L << (_la - 192)) & ((1L << (MINUS - 192)) | (1L << (MULT - 192)) | (1L << (NEQ - 192)) | (1L << (PLUS - 192)) | (1L << (POW - 192)) | (1L << (RPAREN - 192)) | (1L << (HASHCONST - 192)) | (1L << (HASHIF - 192)) | (1L << (L_SQUARE_BRACKET - 192)) | (1L << (R_SQUARE_BRACKET - 192)) | (1L << (STRINGLITERAL - 192)) | (1L << (OCTLITERAL - 192)) | (1L << (HEXLITERAL - 192)) | (1L << (SHORTLITERAL - 192)) | (1L << (INTEGERLITERAL - 192)) | (1L << (DOUBLELITERAL - 192)) | (1L << (DATELITERAL - 192)) | (1L << (NEWLINE - 192)) | (1L << (REMCOMMENT - 192)) | (1L << (COMMENT - 192)) | (1L << (SINGLEQUOTE - 192)) | (1L << (UNDERSCORE - 192)) | (1L << (WS - 192)) | (1L << (IDENTIFIER - 192)) | (1L << (LINE_CONTINUATION - 192)) | (1L << (ERRORCHAR - 192)))) != 0)) {
+			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << COMMA) | (1L << COLON) | (1L << SEMICOLON) | (1L << EXCLAMATIONPOINT) | (1L << DOT) | (1L << HASH) | (1L << AT) | (1L << PERCENT) | (1L << DOLLAR) | (1L << AMPERSAND) | (1L << ACCESS) | (1L << ADDRESSOF) | (1L << ALIAS) | (1L << AND) | (1L << ATTRIBUTE) | (1L << APPACTIVATE) | (1L << APPEND) | (1L << AS) | (1L << BEGIN) | (1L << BEEP) | (1L << BINARY) | (1L << BOOLEAN) | (1L << BYVAL) | (1L << BYREF) | (1L << BYTE) | (1L << CALL) | (1L << CASE) | (1L << CHDIR) | (1L << CHDRIVE) | (1L << CLASS) | (1L << CLOSE) | (1L << COLLECTION) | (1L << CONST) | (1L << DATABASE) | (1L << DATE) | (1L << DECLARE) | (1L << DEFBOOL) | (1L << DEFBYTE) | (1L << DEFDATE) | (1L << DEFDBL) | (1L << DEFDEC) | (1L << DEFCUR) | (1L << DEFINT) | (1L << DEFLNG) | (1L << DEFOBJ) | (1L << DEFSNG) | (1L << DEFSTR) | (1L << DEFVAR) | (1L << DELETESETTING) | (1L << DIM) | (1L << DO) | (1L << DOUBLE) | (1L << EACH) | (1L << ELSE) | (1L << ELSEIF) | (1L << EMPTY) | (1L << END_ENUM) | (1L << END_FUNCTION) | (1L << END_IF) | (1L << END_PROPERTY) | (1L << END_SELECT) | (1L << END_SUB) | (1L << END_TYPE))) != 0) || ((((_la - 64)) & ~0x3f) == 0 && ((1L << (_la - 64)) & ((1L << (END_WITH - 64)) | (1L << (END - 64)) | (1L << (ENUM - 64)) | (1L << (EQV - 64)) | (1L << (ERASE - 64)) | (1L << (ERROR - 64)) | (1L << (EVENT - 64)) | (1L << (EXIT_DO - 64)) | (1L << (EXIT_FOR - 64)) | (1L << (EXIT_FUNCTION - 64)) | (1L << (EXIT_PROPERTY - 64)) | (1L << (EXIT_SUB - 64)) | (1L << (FALSE - 64)) | (1L << (FILECOPY - 64)) | (1L << (FRIEND - 64)) | (1L << (FOR - 64)) | (1L << (FUNCTION - 64)) | (1L << (GET - 64)) | (1L << (GLOBAL - 64)) | (1L << (GOSUB - 64)) | (1L << (GOTO - 64)) | (1L << (IF - 64)) | (1L << (IMP - 64)) | (1L << (IMPLEMENTS - 64)) | (1L << (IN - 64)) | (1L << (INPUT - 64)) | (1L << (IS - 64)) | (1L << (INTEGER - 64)) | (1L << (KILL - 64)) | (1L << (LOAD - 64)) | (1L << (LOCK - 64)) | (1L << (LONG - 64)) | (1L << (LOOP - 64)) | (1L << (LET - 64)) | (1L << (LIB - 64)) | (1L << (LIKE - 64)) | (1L << (LINE_INPUT - 64)) | (1L << (LOCK_READ - 64)) | (1L << (LOCK_WRITE - 64)) | (1L << (LOCK_READ_WRITE - 64)) | (1L << (LSET - 64)) | (1L << (ME - 64)) | (1L << (MID - 64)) | (1L << (MKDIR - 64)) | (1L << (MOD - 64)) | (1L << (NAME - 64)) | (1L << (NEXT - 64)) | (1L << (NEW - 64)) | (1L << (NOT - 64)) | (1L << (NOTHING - 64)) | (1L << (NULL - 64)) | (1L << (ON - 64)) | (1L << (ON_ERROR - 64)) | (1L << (ON_LOCAL_ERROR - 64)) | (1L << (OPEN - 64)) | (1L << (OPTIONAL - 64)) | (1L << (OPTION_BASE - 64)) | (1L << (OPTION_EXPLICIT - 64)) | (1L << (OPTION_COMPARE - 64)) | (1L << (OPTION_PRIVATE_MODULE - 64)) | (1L << (OR - 64)) | (1L << (OUTPUT - 64)) | (1L << (PARAMARRAY - 64)) | (1L << (PRESERVE - 64)))) != 0) || ((((_la - 128)) & ~0x3f) == 0 && ((1L << (_la - 128)) & ((1L << (PRINT - 128)) | (1L << (PRIVATE - 128)) | (1L << (PROPERTY_GET - 128)) | (1L << (PROPERTY_LET - 128)) | (1L << (PROPERTY_SET - 128)) | (1L << (PTRSAFE - 128)) | (1L << (PUBLIC - 128)) | (1L << (PUT - 128)) | (1L << (RANDOM - 128)) | (1L << (RANDOMIZE - 128)) | (1L << (RAISEEVENT - 128)) | (1L << (READ - 128)) | (1L << (READ_WRITE - 128)) | (1L << (REDIM - 128)) | (1L << (REM - 128)) | (1L << (RESET - 128)) | (1L << (RESUME - 128)) | (1L << (RETURN - 128)) | (1L << (RMDIR - 128)) | (1L << (RSET - 128)) | (1L << (SAVEPICTURE - 128)) | (1L << (SAVESETTING - 128)) | (1L << (SEEK - 128)) | (1L << (SELECT - 128)) | (1L << (SENDKEYS - 128)) | (1L << (SET - 128)) | (1L << (SETATTR - 128)) | (1L << (SHARED - 128)) | (1L << (SINGLE - 128)) | (1L << (SPC - 128)) | (1L << (STATIC - 128)) | (1L << (STEP - 128)) | (1L << (STOP - 128)) | (1L << (STRING - 128)) | (1L << (SUB - 128)) | (1L << (TAB - 128)) | (1L << (TEXT - 128)) | (1L << (THEN - 128)) | (1L << (TIME - 128)) | (1L << (TO - 128)) | (1L << (TRUE - 128)) | (1L << (TYPE - 128)) | (1L << (TYPEOF - 128)) | (1L << (UNLOAD - 128)) | (1L << (UNLOCK - 128)) | (1L << (UNTIL - 128)) | (1L << (VARIANT - 128)) | (1L << (VERSION - 128)) | (1L << (WEND - 128)) | (1L << (WHILE - 128)) | (1L << (WIDTH - 128)) | (1L << (WITH - 128)) | (1L << (WITHEVENTS - 128)) | (1L << (WRITE - 128)) | (1L << (XOR - 128)) | (1L << (ASSIGN - 128)) | (1L << (DIV - 128)) | (1L << (INTDIV - 128)) | (1L << (EQ - 128)) | (1L << (GEQ - 128)) | (1L << (GT - 128)) | (1L << (LEQ - 128)) | (1L << (LPAREN - 128)) | (1L << (LT - 128)))) != 0) || ((((_la - 192)) & ~0x3f) == 0 && ((1L << (_la - 192)) & ((1L << (MINUS - 192)) | (1L << (MULT - 192)) | (1L << (NEQ - 192)) | (1L << (PLUS - 192)) | (1L << (POW - 192)) | (1L << (RPAREN - 192)) | (1L << (HASHCONST - 192)) | (1L << (HASHIF - 192)) | (1L << (L_SQUARE_BRACKET - 192)) | (1L << (R_SQUARE_BRACKET - 192)) | (1L << (STRINGLITERAL - 192)) | (1L << (OCTLITERAL - 192)) | (1L << (HEXLITERAL - 192)) | (1L << (SHORTLITERAL - 192)) | (1L << (INTEGERLITERAL - 192)) | (1L << (DOUBLELITERAL - 192)) | (1L << (DATELITERAL - 192)) | (1L << (NEWLINE - 192)) | (1L << (REMCOMMENT - 192)) | (1L << (COMMENT - 192)) | (1L << (SINGLEQUOTE - 192)) | (1L << (UNDERSCORE - 192)) | (1L << (WS - 192)) | (1L << (IDENTIFIER - 192)) | (1L << (LINE_CONTINUATION - 192)) | (1L << (GUIDLITERAL - 192)) | (1L << (ERRORCHAR - 192)))) != 0)) {
 				{
 				State = 46;
 				switch ( Interpreter.AdaptivePredict(_input,0,_ctx) ) {
@@ -2120,7 +2120,7 @@ private bool ccExpression_sempred(CcExpressionContext _localctx, int predIndex)
 	}
 
 	public static readonly string _serializedATN =
-		"\x3\xAF6F\x8320\x479D\xB75C\x4880\x1605\x191C\xAB37\x3\xDE\x19E\x4\x2"+
+		"\x3\xAF6F\x8320\x479D\xB75C\x4880\x1605\x191C\xAB37\x3\xDF\x19E\x4\x2"+
 		"\t\x2\x4\x3\t\x3\x4\x4\t\x4\x4\x5\t\x5\x4\x6\t\x6\x4\a\t\a\x4\b\t\b\x4"+
 		"\t\t\t\x4\n\t\n\x4\v\t\v\x4\f\t\f\x4\r\t\r\x4\xE\t\xE\x4\xF\t\xF\x4\x10"+
 		"\t\x10\x4\x11\t\x11\x4\x12\t\x12\x4\x13\t\x13\x4\x14\t\x14\x4\x15\t\x15"+

Rubberduck.Parsing/Grammar/VBAParser.cs

@@ -179,12 +179,6 @@
     <Compile Include="Symbols\ValuedDeclaration.cs" />
     <Compile Include="VBA\AttributeParser.cs" />
     <Compile Include="VBA\Attributes.cs" />
-    <Compile Include="VBA\AttributesBaseListener.cs" />
-    <Compile Include="VBA\AttributesBaseVisitor.cs" />
-    <Compile Include="VBA\AttributesLexer.cs" />
-    <Compile Include="VBA\AttributesListener.cs" />
-    <Compile Include="VBA\AttributesParser.cs" />
-    <Compile Include="VBA\AttributesVisitor.cs" />
     <Compile Include="VBA\EnumerableExtensions.cs" />
     <Compile Include="VBA\IAttributeParser.cs" />
     <Compile Include="VBA\IModuleExporter.cs" />
@@ -214,11 +208,6 @@
     <None Include="Preprocessing\VBAConditionalCompilationParser.g4" />
     <None Include="Preprocessing\VBADate.g4" />
     <None Include="Preprocessing\VBALike.g4" />
-    <None Include="VBA\Attributes.g4">
-      <Generator>MSBuild:Compile</Generator>
-      <CustomToolNamespace>Rubberduck.Parsing.Grammar</CustomToolNamespace>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Rubberduck.VBEEditor\Rubberduck.VBEditor.csproj">