Merge pull request #1272 from SteveL-MSFT/bicep-user-function

Add support for user function namespace to have underscore prefix

Author: SteveL-MSFT

dsc/tests/dsc_user_functions.tests.ps1

@@ -3,15 +3,15 @@
 
 Describe 'user function tests' {
     It 'user function working with expression: <expression>' -TestCases @(
-        @{ expression = "[MyFunction.ComboFunction('test', 42, true)]"; expected = 'test-42-True' }
+        @{ expression = "[__MyFunction.ComboFunction('test', 42, true)]"; expected = 'test-42-True' }
         @{ expression = "[MyOtherNamespace.ArrayFunction(createArray('a','b','c','d'))]"; expected = @('["b","c","d"]-a') }
     ) {
         param($expression, $expected)
 
         $configYaml = @"
 `$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
 functions:
-- namespace: MyFunction
+- namespace: __MyFunction
   members:
     ComboFunction:
       parameters:

grammars/tree-sitter-dscexpression/grammar.js

@@ -24,7 +24,7 @@ module.exports = grammar({
 
     function: $ => prec(PREC.FUNCTION, seq(field('name', $.functionName), '(', field('args', optional($.arguments)), ')')),
     functionName: $ => choice(
-      /[a-zA-Z][a-zA-Z0-9]*(\.[a-zA-Z0-9]+)?/,
+      /[_a-zA-Z][_a-zA-Z0-9]*(\.[a-zA-Z0-9]+)?/,
       $._booleanLiteral
     ),
     arguments: $ => seq($._argument, repeat(seq(',', $._argument))),

grammars/tree-sitter-dscexpression/test/corpus/valid_expressions.txt

@@ -370,3 +370,16 @@ User Function with nested function
               (function
                 (functionName)))
             (boolean)))))
+
+=====
+User Function with namespace prefixed by underscores
+=====
+[__bicep.myFunction('param1')]
+---
+
+    (statement
+      (expression
+        (function
+          (functionName)
+          (arguments
+            (string)))))