cfengine3 and nakedvars

[miekg]

The following snippet returns error tokens with the current XML for cfengine3:

bundle agent prometheus_server
{
    files:

      IsPrometheusServer::
        "/etc/prometheus/sd_configs/node_servers.json"
          copy_from => no_backup_rdcp("$(def.distr_files_dir)/etc/prometheus/sd_configs/node_servers.json", $(sys.policy_hub)),
          perms     => mog(0666, bin, bin);
}

The $(sys.policy_hub) isn't detected at all, but returned as:

chroma.Token {Error $}
chroma.Token {Punctuation (}
chroma.Token {NameFunction sys}
chroma.Token {Error .}
chroma.Token {NameFunction policy_hub}
chroma.Token {Punctuation )}

I think this is because currently it is assumed these type a constructs are always embedded in quotes.

The following diff fixes it, but unsure if this should also be a NameVar, @olehermanse any thoughts?

diff --git cfengine3.xml cfengine3.xml
index 5c91ac7..4950305 100644
--- cfengine3.xml
+++ cfengine3.xml
@@ -111,6 +111,9 @@
       <rule pattern="@[{(][^)}]+[})]">
         <token type="NameVariable"/>
       </rule>
+      <rule pattern="\$[(][^)]+[)]">
+        <token type="NameVariable"/>
+      </rule>
       <rule pattern="[(){},;]">
         <token type="Punctuation"/>
       </rule>

baring any crazier CFengine3 files, this allows me to delete all lexer code dealing with Error tokens in the test corpus I have

[olehermanse]

@miekg Yea, that rule looks correct to me, treating @() in the same way as $().