adding DeclarationType.BracketedExpression; fixes #2548.

Author: retailcoder

RetailCoder.VBE/UI/Command/MenuItems/CommandBars/IContextFormatter.cs

@@ -45,13 +45,13 @@ private string Format(Declaration declaration)
 
             typeName = "(" + declarationType + (string.IsNullOrEmpty(typeName) ? string.Empty : ":" + typeName) + ")";
 
-            if (declaration.DeclarationType.HasFlag(DeclarationType.Project))
+            if (declaration.DeclarationType.HasFlag(DeclarationType.Project) || declaration.DeclarationType == DeclarationType.BracketedExpression)
             {
-                formattedDeclaration = System.IO.Path.GetFileName(declaration.QualifiedName.QualifiedModuleName.ProjectPath) + ";" + declaration.IdentifierName;
+                formattedDeclaration = System.IO.Path.GetFileName(declaration.QualifiedName.QualifiedModuleName.ProjectPath) + ";" + declaration.IdentifierName + " (" + declarationType + ")";
             }
             else if (declaration.DeclarationType.HasFlag(DeclarationType.Module))
             {
-                formattedDeclaration = moduleName.ToString();
+                formattedDeclaration = moduleName + " (" + declarationType + ")";
             }
 
             if (declaration.DeclarationType.HasFlag(DeclarationType.Member))

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

@@ -1908,4 +1908,7 @@ Would you like to import them to Rubberduck?</value>
   <data name="IndenterSettings_VerticalSpacingLabel" xml:space="preserve">
     <value>Vertical Spacing</value>
   </data>
+  <data name="DeclarationType_BracketedExpression" xml:space="preserve">
+    <value>runtime expression</value>
+  </data>
 </root>

RetailCoder.VBE/UI/RubberduckUI.resx

@@ -1,6 +1,7 @@
 using Antlr4.Runtime;
 using Rubberduck.Parsing.Symbols;
 using System.Linq;
+using Rubberduck.Parsing.Grammar;
 
 namespace Rubberduck.Parsing.Binding
 {
@@ -28,7 +29,8 @@ public SimpleNameDefaultBinding(
             _module = module;
             _parent = parent;
             _context = context;
-            _name = name;
+            // hack; SimpleNameContext.Identifier() excludes the square brackets
+            _name = context.Start.Text == "[" && context.Stop.Text == "]" ? "[" + name + "]" : name;
             _propertySearchType = StatementContext.GetSearchDeclarationType(statementContext);
         }
 
@@ -68,8 +70,16 @@ public IBoundExpression Resolve()
                 return boundExpression;
             }
 
-            var undeclaredLocal = _declarationFinder.OnUndeclaredVariable(_parent, _name, _context);
-            return new SimpleNameExpression(undeclaredLocal, ExpressionClassification.Variable, _context);
+            if (_context.Start.Text == "[" && _context.Stop.Text == "]")
+            {
+                var bracketedExpression = _declarationFinder.OnBracketedExpression(_context.GetText(), _context);
+                return new SimpleNameExpression(bracketedExpression, ExpressionClassification.Unbound, _context);
+            }
+            else
+            {
+                var undeclaredLocal = _declarationFinder.OnUndeclaredVariable(_parent, _name, _context);
+                return new SimpleNameExpression(undeclaredLocal, ExpressionClassification.Variable, _context);
+            }
             //return new ResolutionFailedExpression();
         }
 

Rubberduck.Parsing/Binding/SimpleNameDefaultBinding.cs

@@ -6,6 +6,8 @@
 using System.Diagnostics;
 using System.Linq;
 using Antlr4.Runtime;
+using Rubberduck.Parsing.Grammar;
+using Rubberduck.VBEditor.Application;
 
 namespace Rubberduck.Parsing.Symbols
 {
@@ -26,6 +28,7 @@ public static IEnumerable<TValue> AllValues<TKey, TValue>(
 
     public class DeclarationFinder
     {
+        private readonly IHostApplication _hostApp;
         private readonly IDictionary<QualifiedModuleName, IAnnotation[]> _annotations;
         private readonly IDictionary<QualifiedMemberName, IList<Declaration>> _undeclared;
         private readonly AnnotationService _annotationService;
@@ -34,10 +37,9 @@ public class DeclarationFinder
         private readonly IDictionary<string, Declaration[]> _declarationsByName;
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        public DeclarationFinder(
-            IReadOnlyList<Declaration> declarations,
-            IEnumerable<IAnnotation> annotations)
+        public DeclarationFinder(IReadOnlyList<Declaration> declarations, IEnumerable<IAnnotation> annotations, IHostApplication hostApp = null)
         {
+            _hostApp = hostApp;
             _annotations = annotations.GroupBy(node => node.QualifiedSelection.QualifiedName)
                 .ToDictionary(grouping => grouping.Key, grouping => grouping.ToArray());
             _declarations = declarations.GroupBy(item => item.QualifiedName.QualifiedModuleName)
@@ -343,6 +345,24 @@ public Declaration OnUndeclaredVariable(Declaration enclosingProcedure, string i
             return undeclaredLocal;
         }
 
+        public Declaration OnBracketedExpression(string expression, ParserRuleContext context)
+        {
+            var hostApp = FindProject(_hostApp == null ? "VBA" : _hostApp.ApplicationName);
+            var qualifiedName = hostApp.QualifiedName.QualifiedModuleName.QualifyMemberName(expression);
+
+            var exists = _undeclared.ContainsKey(qualifiedName);
+            if (exists)
+            {
+                return _undeclared[qualifiedName][0];
+            }
+            else
+            {
+                var item = new Declaration(qualifiedName, hostApp, hostApp, Tokens.Variant, string.Empty, false, false, Accessibility.Global, DeclarationType.BracketedExpression, context, context.GetSelection(), false, null);
+                _undeclared.Add(qualifiedName, new List<Declaration> { item });
+                return item;
+            }
+        }
+
         public Declaration FindMemberEnclosedProjectWithoutEnclosingModule(Declaration callingProject, Declaration callingModule, Declaration callingParent, string memberName, DeclarationType memberType)
         {
             var allMatches = MatchName(memberName);

Rubberduck.Parsing/Symbols/DeclarationFinder.cs

@@ -60,7 +60,9 @@ public enum DeclarationType
         [DebuggerDisplay("LineLabel")]
         LineLabel = 1 << 25,
         [DebuggerDisplay("UnresolvedMember")]
-        UnresolvedMember = 1 << 26
+        UnresolvedMember = 1 << 26,
+        [DebuggerDisplay("BracketedExpression")]
+        BracketedExpression = 1 << 27,
     }
 
     public interface IIdentifier { IdentifierNode Identifier { get; } }

Rubberduck.Parsing/Symbols/DeclarationType.cs

@@ -14,6 +14,9 @@
 using NLog;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using System.Runtime.InteropServices;
+using Rubberduck.VBEditor.Application;
+using Rubberduck.VBEditor.Extensions;
+
 // ReSharper disable LoopCanBeConvertedToQuery
 
 namespace Rubberduck.Parsing.VBA
@@ -36,6 +39,7 @@ private readonly IDictionary<IVBComponent, IDictionary<Tuple<string, Declaration
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         private readonly bool _isTestScope;
+        private readonly IHostApplication _hostApp;
 
         public ParseCoordinator(
             IVBE vbe,
@@ -51,6 +55,7 @@ public ParseCoordinator(
             _preprocessorFactory = preprocessorFactory;
             _customDeclarationLoaders = customDeclarationLoaders;
             _isTestScope = isTestScope;
+            _hostApp = _vbe.HostApplication();
 
             state.ParseRequest += ReparseRequested;
         }
@@ -291,7 +296,7 @@ private Task[] ResolveReferencesAsync(CancellationToken token)
                 State.SetModuleState(kvp.Key.Component, ParserState.ResolvingReferences);
             }
 
-            var finder = new DeclarationFinder(State.AllDeclarations, State.AllAnnotations);
+            var finder = new DeclarationFinder(State.AllDeclarations, State.AllAnnotations, _hostApp);
             var passes = new List<ICompilationPass>
                 {
                     // This pass has to come first because the type binding resolution depends on it.