From cc132eda7524cfab047d61c7eb05ad663dd660af Mon Sep 17 00:00:00 2001
From: Miek Gieben <miek@miek.nl>
Date: Fri, 17 Mar 2023 08:08:27 +0100
Subject: [PATCH] cfengine3 (#766)

* Fix CommentPreproc

Macros (i.e.) CommentPreproc need to be anchored as they are only
allowed to be put on the start of the line. This also solved the
conflict with nakedvar @(....).

Signed-off-by: Miek Gieben <miek@miek.nl>

* Fix NameClass

NameClass (`xxx::`) can _also_ contain variables, so add " and $ to the
allowed list in the regexp. This now also needs to be put earlier to
match before any strings.

Signed-off-by: Miek Gieben <miek@miek.nl>

---------

Signed-off-by: Miek Gieben <miek@miek.nl>
---
 lexers/embedded/cfengine3.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lexers/embedded/cfengine3.xml b/lexers/embedded/cfengine3.xml
index 8c4c1a8f1..5c91ac755 100644
--- a/lexers/embedded/cfengine3.xml
+++ b/lexers/embedded/cfengine3.xml
@@ -38,7 +38,7 @@
       <rule pattern="#.*?\n">
         <token type="Comment"/>
       </rule>
-      <rule pattern="@.*?\n">
+      <rule pattern="^@.*?\n">
         <token type="CommentPreproc"/>
       </rule>
       <rule pattern="(body)(\s+)(\S+)(\s+)(control)">
@@ -78,6 +78,12 @@
           <token type="Text"/>
         </bygroups>
       </rule>
+      <rule pattern="([\w.!&amp;|()&#34;&#36;]+)(::)">
+        <bygroups>
+          <token type="NameClass"/>
+          <token type="Punctuation"/>
+        </bygroups>
+      </rule>
       <rule pattern="&#34;">
         <token type="LiteralString"/>
         <push state="doublequotestring"/>
@@ -96,12 +102,6 @@
           <token type="Punctuation"/>
         </bygroups>
       </rule>
-      <rule pattern="([\w.!&amp;|()]+)(::)">
-        <bygroups>
-          <token type="NameClass"/>
-          <token type="Punctuation"/>
-        </bygroups>
-      </rule>
       <rule pattern="(\w+)(:)">
         <bygroups>
           <token type="KeywordDeclaration"/>