Merge branch 'next' of https://github.com/rubberduck-vba/Rubberduck into InvestigatingPermissiveAssertClass

Author: IvenBach

Rubberduck.CodeAnalysis/Inspections/Concrete/IllegalAnnotationInspection.cs

@@ -85,7 +85,8 @@ public void ClearContexts()
             private void SetCurrentScope(string memberName = null)
             {
                 _hasMembers = !string.IsNullOrEmpty(memberName);
-                _isFirstMemberProcessed = _hasMembers;
+                // this is a one-time toggle until contexts are reset
+                _isFirstMemberProcessed |= _hasMembers; 
                 _currentScopeDeclaration = _hasMembers ? _members.Value[memberName] : _module.Value;
             }
 
@@ -108,6 +109,9 @@ public override void EnterModule(VBAParser.ModuleContext context)
                     .Members(CurrentModuleName)
                     .GroupBy(m => m.IdentifierName)
                     .ToDictionary(m => m.Key, m => m.First()));
+
+                // we did not process the first member of the module we just entered, so reset here
+                _isFirstMemberProcessed = false; 
             }
 
             public override void ExitModule(VBAParser.ModuleContext context)

Rubberduck.Core/AutoComplete/AutoCompleteService.cs

@@ -59,7 +59,7 @@ private void HandleKeyDown(object sender, AutoCompleteEventArgs e)
             var qualifiedSelection = module.GetQualifiedSelection();
             var pSelection = qualifiedSelection.Value.Selection;
 
-            if (_popupShown || (e.Keys != Keys.None && pSelection.LineCount > 1))
+            if (_popupShown || (e.Keys != Keys.None && pSelection.LineCount > 1) || e.Keys == Keys.Delete)
             {
                 return;
             }
@@ -78,7 +78,6 @@ private void HandleKeyDown(object sender, AutoCompleteEventArgs e)
                 }
             }
 
-            var handleDelete = e.Keys == Keys.Delete && pSelection.EndColumn <= currentContent.Length;
             var handleBackspace = e.Keys == Keys.Back && pSelection.StartColumn > 1;
             var handleTab = e.Keys == Keys.Tab && !pSelection.IsSingleCharacter;
             var handleEnter = e.Keys == Keys.Enter && !pSelection.IsSingleCharacter;

Rubberduck.Parsing/Grammar/VBAParser.g4

@@ -561,7 +561,7 @@ withStmt :
 ;
 
 // Special forms with special syntax, only available in VBA reports or VB6 forms and pictureboxes.
-lineSpecialForm : expression whiteSpace (STEP whiteSpace?)? tuple MINUS (STEP whiteSpace?)? tuple whiteSpace? (COMMA whiteSpace? expression)? whiteSpace? (COMMA whiteSpace? lineSpecialFormOption)?;
+lineSpecialForm : expression whiteSpace ((STEP whiteSpace?)? tuple)? MINUS (STEP whiteSpace?)? tuple whiteSpace? (COMMA whiteSpace? expression)? whiteSpace? (COMMA whiteSpace? lineSpecialFormOption)?;
 circleSpecialForm : (expression whiteSpace? DOT whiteSpace?)? CIRCLE whiteSpace (STEP whiteSpace?)? tuple (whiteSpace? COMMA whiteSpace? expression)+;
 scaleSpecialForm : (expression whiteSpace? DOT whiteSpace?)? SCALE whiteSpace tuple whiteSpace? MINUS whiteSpace? tuple;
 pSetSpecialForm : (expression whiteSpace? DOT whiteSpace?)? PSET (whiteSpace STEP)? whiteSpace? tuple whiteSpace? (COMMA whiteSpace? expression)?;

RubberduckTests/Grammar/VBAParserTests.cs

@@ -2486,6 +2486,18 @@ Sub Test()
             AssertTree(parseResult.Item1, parseResult.Item2, "//lineSpecialForm");
         }
 
+        [Category("Parser")]
+        [Test]
+        public void TestLineAccessReport_WithoutStartingTuple()
+        {
+            string code = @"
+Sub Test()
+    Me.Line -(2, 2)
+End Sub";
+            var parseResult = Parse(code);
+            AssertTree(parseResult.Item1, parseResult.Item2, "//lineSpecialForm");
+        }
+
         [Category("Parser")]
         [Test]
         public void TestLineAccessReport_WithoutStep()

RubberduckTests/Inspections/IllegalAnnotationsInspectionTests.cs

@@ -30,6 +30,39 @@ public void NoAnnotation_NoResult()
             }
         }
 
+        [Test]
+        [Category("Inspections")]
+        public void FirstMemberAnnotation_IsNotIllegal_InMultipleModules()
+        {
+            const string inputCode1 =
+                @"'@TestModule
+'@Folder(""Test"")
+Option Explicit
+
+'@ModuleInitialize
+Public Sub ModuleInitializeLegal()
+End Sub";
+            const string inputCode2 =
+                @"'@TestModule
+'@Folder(""Test"")
+Option Explicit
+
+'@ModuleInitialize
+Public Sub ModuleInitializeAlsoLegal()
+End Sub";
+
+            var vbe = MockVbeBuilder.BuildFromStdModules(("Module1", inputCode1), ("Module2", inputCode2));
+            using (var state = MockParser.CreateAndParse(vbe.Object))
+            {
+
+                var inspection = new IllegalAnnotationInspection(state);
+                var inspector = InspectionsHelper.GetInspector(inspection);
+                var inspectionResults = inspector.FindIssuesAsync(state, CancellationToken.None).Result;
+
+                Assert.IsFalse(inspectionResults.Any());
+            }
+        }
+
         [Test]
         [Category("Inspections")]
         public void GivenLegalModuleAnnotation_NoResult()