Add option to SkipToRelevant to not skip reference nodes which do not contain a prefix

Author: dhoepelman

CHANGELOG.md

@@ -1,9 +1,10 @@
 # Changelog
 
-*Changes which are in master, but not yet in a release*:
+*Changes which are in this source code, but not yet in a release*:
 
 * Adds equality to `PrefixInfo` class
 * Fixes parse error if external reference file path contains a space (`='C:\My Dir\[file.xlsx]Sheet'!A1`)
+* Adds an option to `ExcelFormulaParser.SkipToRelevant` to not skip reference nodes which do not contain a prefix
 
 
 ## 1.2.1

src/XLParser/ExcelFormulaParser.cs

@@ -376,14 +376,15 @@ public static IEnumerable<ParseTreeNode> GetReferenceNodes(this ParseTreeNode in
         /// <summary>
         /// Go to the first "relevant" child node, i.e. skips wrapper nodes
         /// </summary>
+        /// <param name="skipReferencesWithoutPrefix">If true, skip all reference nodes without a prefix instead of only parentheses</param>
         /// <remarks>
         /// Skips:
         /// * FormulaWithEq and ArrayFormula nodes
         /// * Formula nodes
         /// * Parentheses
         /// * Reference nodes which are just wrappers
         /// </remarks>
-        public static ParseTreeNode SkipToRelevant(this ParseTreeNode input)
+        public static ParseTreeNode SkipToRelevant(this ParseTreeNode input, bool skipReferencesWithoutPrefix = true)
         {
             while (true)
             {
@@ -395,8 +396,6 @@ public static ParseTreeNode SkipToRelevant(this ParseTreeNode input)
                         break;
                     case GrammarNames.Argument:
                     case GrammarNames.Formula:
-                    case GrammarNames.Reference:
-                        // This also catches parentheses
                         if (input.ChildNodes.Count == 1)
                         {
                             input = input.ChildNodes[0];
@@ -406,6 +405,18 @@ public static ParseTreeNode SkipToRelevant(this ParseTreeNode input)
                             return input;
                         }
                         break;
+                    case GrammarNames.Reference:
+                        // Skip references which are parentheses
+                        // Skip references without a prefix (=> they only have one child node) if the option is set
+                        if ((skipReferencesWithoutPrefix && input.ChildNodes.Count == 1) || input.IsParentheses())
+                        {
+                            input = input.ChildNodes[0];
+                        }
+                        else
+                        {
+                            return input;
+                        }
+                        break;
                     default:
                         return input;
                 }