Merge pull request #1123 from retailcoder/CodeExplorer

Grammar fix for precompiler directives

Author: retailcoder

RetailCoder.VBE/AutoSave/AutoSave.cs

@@ -24,10 +24,14 @@ public AutoSave(VBE vbe, IGeneralConfigService configService)
 
             _configService.SettingsChanged += ConfigServiceSettingsChanged;
 
-            _timer.Enabled = _config.UserSettings.GeneralSettings.AutoSaveEnabled;
-            _timer.Interval = _config.UserSettings.GeneralSettings.AutoSavePeriod * 1000;
+            _timer.Enabled = _config.UserSettings.GeneralSettings.AutoSaveEnabled 
+                && _config.UserSettings.GeneralSettings.AutoSavePeriod != 0;
 
-            _timer.Elapsed += _timer_Elapsed;
+            if (_config.UserSettings.GeneralSettings.AutoSavePeriod != 0)
+            {
+                _timer.Interval = _config.UserSettings.GeneralSettings.AutoSavePeriod * 1000;
+                _timer.Elapsed += _timer_Elapsed;
+            }
         }
 
         void ConfigServiceSettingsChanged(object sender, EventArgs e)

Rubberduck.Parsing/Grammar/VBA.g4

@@ -121,7 +121,7 @@ moduleConfigElement :
 
 moduleAttributes : (attributeStmt endOfLine+)+;
 
-moduleDeclarations : moduleDeclarationsElement (endOfLine+ moduleDeclarationsElement)*;
+moduleDeclarations : moduleDeclarationsElement (endOfLine+ moduleDeclarationsElement)* endOfLine*;
 
 moduleOption : 
 	OPTION_BASE WS SHORTLITERAL 					# optionBaseStmt
@@ -140,10 +140,13 @@ moduleDeclarationsElement :
 	| variableStmt
 	| moduleOption
 	| typeStmt
-	| macroConstStmt
-	| macroIfThenElseStmt
+	| macroStmt
 ;
 
+macroStmt :
+	macroConstStmt
+	| macroIfThenElseStmt;
+
 moduleBody : 
 	moduleBodyElement (endOfLine+ moduleBodyElement)*;
 
@@ -153,8 +156,7 @@ moduleBodyElement :
 	| propertySetStmt 
 	| propertyLetStmt 
 	| subStmt 
-	| macroConstStmt
-	| macroIfThenElseStmt
+	| macroStmt
 ;
 
 
@@ -197,8 +199,7 @@ blockStmt :
 	| loadStmt
 	| lockStmt
 	| lsetStmt
-	| macroConstStmt
-	| macroIfThenElseStmt
+	| macroStmt
 	| midStmt
 	| mkdirStmt
 	| nameStmt