Auto-sync from Azure-Kusto-Service

Author: Kusto Build System

src/Kusto.Language/Binder/Binder_FunctionCalls.cs

@@ -46,12 +46,6 @@ private SemanticInfo BindFunctionCallOrPattern(FunctionCallExpression functionCa
             }
         }
 
-        private static bool IsInvokeOperatorFunctionCall(FunctionCallExpression functionCall)
-        {
-            return functionCall.Parent is InvokeOperator
-                || (functionCall.Parent is PathExpression p && p.Selector == functionCall && p.Parent is InvokeOperator);
-        }
-
         /// <summary>
         /// Binds a function call
         /// </summary>
@@ -329,12 +323,61 @@ private void GetArgumentsAndTypes(
 
             if (IsInvokeOperatorFunctionCall(functionCall))
             {
-                // add fake argument to represent the implicit value
-                arguments.Insert(0, functionCall.Name);
+                // add argument to represent the implicit value
+                if (TryGetInvokeOperatorExpression(functionCall, out var invokeArgument))
+                {
+                    arguments.Insert(0, invokeArgument);
+                }
+                else
+                {
+                    // no preceding expression was found... use the name node instead.
+                    arguments.Insert(0, functionCall.Name);
+                }
+
                 argumentTypes.Insert(0, _implicitArgumentType ?? TableSymbol.Empty);
             }
         }
 
+        private static bool IsInvokeOperatorFunctionCall(FunctionCallExpression functionCall)
+        {
+            // ignore dotted path that is part of function call
+            Expression x = functionCall;
+            while (x.Parent is PathExpression p
+                && p.Selector == x)
+            {
+                x = p.Expression;
+            }
+
+            return x.Parent is InvokeOperator io
+                && io.Function == x;
+        }
+
+        private static bool TryGetInvokeOperatorExpression(FunctionCallExpression functionCall, out Expression invokeArgument)
+        {
+            // ignore dotted path that is part of function call
+            Expression x = functionCall;
+            while (x.Parent is PathExpression p
+                && p.Selector == x)
+            {
+                x = p.Expression;
+            }
+
+            // check for parent pipe expression to find implicit argument
+            if (x.Parent is InvokeOperator invokeOp
+                && invokeOp.Function == x
+                && invokeOp.Parent is PipeExpression invokeOpPipe
+                && invokeOpPipe.Operator == invokeOp)
+            {
+                invokeArgument = invokeOpPipe.Expression;
+                return true;
+            }
+            else
+            {
+                invokeArgument = null;
+                return false;
+            }
+        }
+
         /// <summary>
         /// Gets the parameters that correspond to the arguments.
         /// </summary>

src/Kusto.Language/Parser/CodeGen/EngineCommandGrammar.cs

@@ -67,7 +67,7 @@ internal override CommandParserInfo[] CreateCommandParsers(PredefinedRuleParsers
             var shape35 = new [] {CD(), CD(), CD("TableName", CompletionHint.None), CD(), CD(isOptional: true)};
             var shape36 = new [] {CD("TableName", CompletionHint.None), CD()};
             var shape37 = new [] {CD(), CD(), CD(CompletionHint.None), CD(isOptional: true)};
-            var shape38 = new [] {CD(), CD(), CD(CompletionHint.Table), CD(), CD(isOptional: true)};
+            var shape38 = new [] {CD(), CD(), CD("TableName", CompletionHint.Table), CD(), CD(isOptional: true)};
             var shape39 = CD("NewTableName", CompletionHint.None);
             var shape40 = new [] {CD(), CD(), CD("TableName", CompletionHint.Table), CD(), CD("MappingKind"), CD(), CD("MappingName", CompletionHint.Literal), CD("MappingFormat", CompletionHint.Literal), CD(isOptional: true)};
             var shape41 = CD("NewColumnName", CompletionHint.None);
@@ -1909,7 +1909,7 @@ internal override CommandParserInfo[] CreateCommandParsers(PredefinedRuleParsers
                     If(Not(Token("with")), rules.FunctionNameReference),
                     Token("docstring"),
                     rules.StringLiteral,
-                    new [] {CD(), CD(), CD(CompletionHint.Function), CD(), CD("Documentation", CompletionHint.Literal)}));
+                    new [] {CD(), CD(), CD("FunctionName", CompletionHint.Function), CD(), CD("Documentation", CompletionHint.Literal)}));
 
             var AlterFunctionFolder = Command("AlterFunctionFolder", 
                 Custom(